projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5bb20ec dded4f1)
Merge branch 'rr/fi-import-marks-if-exists'
authorJunio C Hamano <gitster@pobox.com>
Thu, 10 Feb 2011 00:41:16 +0000 (16:41 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 10 Feb 2011 00:41:16 +0000 (16:41 -0800)
* rr/fi-import-marks-if-exists:
  fast-import: Introduce --import-marks-if-exists

1  2 
Documentation/git-fast-import.txt patch | diff1 | diff2 | blob | history
fast-import.c patch | diff1 | diff2 | blob | history
t/t9300-fast-import.sh patch | diff1 | diff2 | blob | history

diff --cc Documentation/git-fast-import.txt
Simple merge
diff --cc fast-import.c
Simple merge
diff --cc t/t9300-fast-import.sh
Simple merge
Git—the stupid content tracker