diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-02-09 16:41:16 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-02-09 16:41:16 -0800 |
| commit | fc180d98a20b6270ec25ca19c8d18a0a1286fe15 (patch) | |
| tree | b6adc1fc09968b5cd087d6c08ec197a0ea312438 /userdiff.c | |
| parent | Merge branch 'jn/unpack-lstat-failure-report' (diff) | |
| parent | fast-import: Introduce --import-marks-if-exists (diff) | |
| download | git-fc180d98a20b6270ec25ca19c8d18a0a1286fe15.tar.gz git-fc180d98a20b6270ec25ca19c8d18a0a1286fe15.zip | |
Merge branch 'rr/fi-import-marks-if-exists'
* rr/fi-import-marks-if-exists:
fast-import: Introduce --import-marks-if-exists
Diffstat (limited to 'userdiff.c')
0 files changed, 0 insertions, 0 deletions