]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7a43ab6 0400583)
Merge branch 'np/log-graph-octopus-fix'
authorJunio C Hamano <gitster@pobox.com>
Fri, 26 Oct 2018 05:22:11 +0000 (14:22 +0900)
committerJunio C Hamano <gitster@pobox.com>
Fri, 26 Oct 2018 05:22:11 +0000 (14:22 +0900)
commit0ffa31fc36ff27edaccbb565323b95dfab2202f5
tree4f56a16c1fb2a42eb49a712583229390ecc4192dtree | snapshot
parent7a43ab6fb25924ca018073ef7ef46e16b3156bd0commit | diff
parent04005834ed07e0b3a63793f386570c8bcf73f9a3commit | diff
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
graph.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.