diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-08-08 14:26:09 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-08-08 14:26:09 -0700 |
commit | 3bcedae27ea2af2e3895d92d6525231e350c91be (patch) | |
tree | 9bf2247236869d3f41bbd0b9a2df746fcc2ecf66 /commit-slab-decl.h | |
parent | 7c20df84bd21ec0215358381844274fa10515017 (diff) | |
parent | a35bea40b674b21fbdb98d982e41c46d014ced83 (diff) |
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
Diffstat (limited to 'commit-slab-decl.h')
0 files changed, 0 insertions, 0 deletions