]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'ds/commit-graph-octopus-fix'
authorJunio C Hamano <gitster@pobox.com>
Thu, 8 Aug 2019 21:26:09 +0000 (14:26 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 8 Aug 2019 21:26:09 +0000 (14:26 -0700)
commit3bcedae27ea2af2e3895d92d6525231e350c91be
tree9bf2247236869d3f41bbd0b9a2df746fcc2ecf66
parent7c20df84bd21ec0215358381844274fa10515017
parenta35bea40b674b21fbdb98d982e41c46d014ced83
Merge branch 'ds/commit-graph-octopus-fix'

commit-graph did not handle commits with more than two parents
correctly, which has been corrected.

* ds/commit-graph-octopus-fix:
  commit-graph: fix bug around octopus merges