diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-10-26 14:22:11 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-10-26 14:22:11 +0900 |
| commit | 0ffa31fc36ff27edaccbb565323b95dfab2202f5 (patch) | |
| tree | 4f56a16c1fb2a42eb49a712583229390ecc4192d /diff-lib.c | |
| parent | Merge branch 'sg/split-index-racefix' (diff) | |
| parent | log: fix coloring of certain octopus merge shapes (diff) | |
| download | git-0ffa31fc36ff27edaccbb565323b95dfab2202f5.tar.gz git-0ffa31fc36ff27edaccbb565323b95dfab2202f5.zip | |
Merge branch 'np/log-graph-octopus-fix'
"git log --graph" showing an octopus merge sometimes miscounted the
number of display columns it is consuming to show the merge and its
parent commits, which has been corrected.
* np/log-graph-octopus-fix:
log: fix coloring of certain octopus merge shapes
Diffstat (limited to 'diff-lib.c')
0 files changed, 0 insertions, 0 deletions