summaryrefslogtreecommitdiff
path: root/userdiff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-02-10 00:41:16 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-02-10 00:41:16 (GMT)
commitfc180d98a20b6270ec25ca19c8d18a0a1286fe15 (patch)
treeb6adc1fc09968b5cd087d6c08ec197a0ea312438 /userdiff.c
parent5bb20ece6bdb31d395667855990dc540f2940a41 (diff)
parentdded4f12a46274753439e3a8fa4eb756c5d14ae1 (diff)
downloadgit-fc180d98a20b6270ec25ca19c8d18a0a1286fe15.zip
git-fc180d98a20b6270ec25ca19c8d18a0a1286fe15.tar.gz
git-fc180d98a20b6270ec25ca19c8d18a0a1286fe15.tar.bz2
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