diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-11-02 13:17:39 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-11-02 13:17:39 -0800 |
| commit | 307a53dd9914f65c9b6399221574e24234e4b49f (patch) | |
| tree | 9fd3400f4a8f3f0782a8803a83f0f076844237ac /mergetools/deltawalker | |
| parent | Merge branch 'es/test-cmp-typocatcher' (diff) | |
| parent | commit-graph: don't write commit-graph when disabled (diff) | |
| download | tgif-307a53dd9914f65c9b6399221574e24234e4b49f.tar.xz | |
Merge branch 'ds/commit-graph-merging-fix'
When "git commit-graph" detects the same commit recorded more than
once while it is merging the layers, it used to die. The code now
ignores all but one of them and continues.
* ds/commit-graph-merging-fix:
commit-graph: don't write commit-graph when disabled
commit-graph: ignore duplicates when merging layers
Diffstat (limited to 'mergetools/deltawalker')
0 files changed, 0 insertions, 0 deletions