]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 121f71f 43bc230)
Merge branch 'js/maint-fast-export-mark-error' into maint
authorJunio C Hamano <gitster@pobox.com>
Sun, 17 Jun 2012 21:00:03 +0000 (14:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 17 Jun 2012 21:00:03 +0000 (14:00 -0700)
"git fast-export" did not give a readable error message when the same
mark erroneously appeared twice in the --import-marks input.

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

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