]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: df7abe3 be011bb)
Merge branch 'ma/fast-export-skip-merge-fix'
authorJunio C Hamano <gitster@pobox.com>
Tue, 8 May 2018 06:59:33 +0000 (15:59 +0900)
committerJunio C Hamano <gitster@pobox.com>
Tue, 8 May 2018 06:59:33 +0000 (15:59 +0900)
"git fast-export" had a regression in v2.15.0 era where it skipped
some merge commits in certain cases, which has been corrected.

* ma/fast-export-skip-merge-fix:
  fast-export: fix regression skipping some merge-commits

1  2 
builtin/fast-export.c patch | diff1 | diff2 | blob | history
t/t9350-fast-export.sh patch | diff1 | diff2 | blob | history

diff --cc builtin/fast-export.c
Simple merge
diff --cc t/t9350-fast-export.sh
Simple merge
Unnamed repository; edit this file 'description' to name the repository.