diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-11-21 22:57:49 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-21 22:57:49 +0900 |
| commit | a51c63809e67a40767313df3bb1ca3e88053ff1f (patch) | |
| tree | 80db21ebef287c8de160958272c749cdcfa384a7 /diff.c | |
| parent | 3f0c460b45b003d3433d3e6f9f471025bb04f63b (diff) | |
| parent | 04005834ed07e0b3a63793f386570c8bcf73f9a3 (diff) | |
Merge branch 'np/log-graph-octopus-fix' into maint
"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.c')
0 files changed, 0 insertions, 0 deletions