Andrew's git / gitweb.git / diff
?
Merge branch 'di/fast-import-doc'
authorJunio C Hamano <gitster@pobox.com>
Thu, 25 Aug 2011 23:00:32 +0000 (16:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 25 Aug 2011 23:00:32 +0000 (16:00 -0700)
* di/fast-import-doc:
doc/fast-import: document feature import-marks-if-exists

1  2 
Documentation/git-fast-import.txt 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 t/t9300-fast-import.sh
Simple merge