projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3f0c460 0400583)
Merge branch 'np/log-graph-octopus-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 21 Nov 2018 13:57:49 +0000 (22:57 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 21 Nov 2018 13:57:49 +0000 (22:57 +0900)
commita51c63809e67a40767313df3bb1ca3e88053ff1f
tree80db21ebef287c8de160958272c749cdcfa384a7tree | snapshot
parent3f0c460b45b003d3433d3e6f9f471025bb04f63bcommit | diff
parent04005834ed07e0b3a63793f386570c8bcf73f9a3commit | 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
graph.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.