projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d5c2d1a 85102ac)
Merge branch 'ds/commit-graph-merging-fix'
authorJunio C Hamano <gitster@pobox.com>
Mon, 2 Nov 2020 21:17:39 +0000 (13:17 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 2 Nov 2020 21:17:39 +0000 (13:17 -0800)
commit307a53dd9914f65c9b6399221574e24234e4b49f
tree9fd3400f4a8f3f0782a8803a83f0f076844237actree | snapshot
parentd5c2d1a0aad8ef59c83d801e6cf378dc8b312f8bcommit | diff
parent85102ac71b98466eaa2b9b5a568c3a1de736202dcommit | diff
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
Documentation/git-commit-graph.txt diff1 | diff2 | blob | history
commit-graph.c diff1 | diff2 | blob | history
t/t5324-split-commit-graph.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.