]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8f8d6ee f94bfa1)
Merge branch 'js/log-remerge-keep-ancestry' into js/range-diff-diff-merges
authorJunio C Hamano <gitster@pobox.com>
Mon, 16 Dec 2024 16:45:14 +0000 (08:45 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 16 Dec 2024 16:45:14 +0000 (08:45 -0800)
* js/log-remerge-keep-ancestry:
  log: --remerge-diff needs to keep around commit parents

1  2 
builtin/log.c patch | diff1 | diff2 | blob | history
t/t4069-remerge-diff.sh patch | diff1 | diff2 | blob | history

diff --cc builtin/log.c
Simple merge
diff --cc t/t4069-remerge-diff.sh
Simple merge
Unnamed repository; edit this file 'description' to name the repository.