![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 31 Jan 2011 03:03:21 +0000 (19:03 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 31 Jan 2011 03:03:21 +0000 (19:03 -0800) |
* rr/fi-import-marks-if-exists:
fast-import: Introduce --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