]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commiteb8374c652e56ee18702a8d0b06dd6bf6d07eff7
treee4a32763449d3d575d57d9bf0491353e55e6470etree | snapshot
parent8f8d6eee531b3fa1a8ef14f169b0cb5035f7a772commit | diff
parentf94bfa151623d7e675db9465ae7ff0b33e4825f3commit | diff
Merge branch 'js/log-remerge-keep-ancestry' into js/range-diff-diff-merges

* 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.