| commit | fc180d98a20b6270ec25ca19c8d18a0a1286fe15 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 10 Feb 2011 00:41:16 +0000 (9 16:41 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 10 Feb 2011 00:41:16 +0000 (9 16:41 -0800) | ||
| tree | b6adc1fc09968b5cd087d6c08ec197a0ea312438 | treesnapshot (tar.gz zip) |
| parent | 5bb20ece6bdb31d395667855990dc540f2940a41 | commitdiff |
| parent | dded4f12a46274753439e3a8fa4eb756c5d14ae1 | commitdiff |
Merge branch 'rr/fi-import-marks-if-exists'
* rr/fi-import-marks-if-exists:
fast-import: Introduce --import-marks-if-exists
* rr/fi-import-marks-if-exists:
fast-import: Introduce --import-marks-if-exists
| Documentation/git-fast-import.txt | diff1 | diff2 | blobhistory |
| fast-import.c | diff1 | diff2 | blobhistory |
| t/t9300-fast-import.sh | diff1 | diff2 | blobhistory |