]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a1f34d5 f94bfa1)
Merge branch 'js/log-remerge-keep-ancestry'
authorJunio C Hamano <gitster@pobox.com>
Thu, 19 Dec 2024 18:58:31 +0000 (10:58 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 19 Dec 2024 18:58:31 +0000 (10:58 -0800)
commitcb89eebf3bb0b78c5193f8b6293b4b22ce8b08ca
treee40d34e3a7718102cd77b845067acbb76812ad62tree | snapshot
parenta1f34d5955035dc64f2e25da0ba2cc0a0c73c21ccommit | diff
parentf94bfa151623d7e675db9465ae7ff0b33e4825f3commit | diff
Merge branch 'js/log-remerge-keep-ancestry'

"git log -p --remerge-diff --reverse" was completely broken.

* js/log-remerge-keep-ancestry:
  log: --remerge-diff needs to keep around commit parents
builtin/log.c diff1 | diff2 | blob | history
t/t4069-remerge-diff.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.