]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 68f532f 43bc230)
Merge branch 'js/maint-fast-export-mark-error'
authorJunio C Hamano <gitster@pobox.com>
Tue, 12 Jun 2012 14:27:50 +0000 (07:27 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 12 Jun 2012 14:27:50 +0000 (07:27 -0700)
* js/maint-fast-export-mark-error:
  fast-export: report SHA-1 instead of gibberish when marks exist already

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.