projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5bb20ec dded4f1)
Merge branch 'rr/fi-import-marks-if-exists'
authorJunio C Hamano <gitster@pobox.com>
Thu, 10 Feb 2011 00:41:16 +0000 (16:41 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 10 Feb 2011 00:41:16 +0000 (16:41 -0800)
commitfc180d98a20b6270ec25ca19c8d18a0a1286fe15
treeb6adc1fc09968b5cd087d6c08ec197a0ea312438tree | snapshot
parent5bb20ece6bdb31d395667855990dc540f2940a41commit | diff
parentdded4f12a46274753439e3a8fa4eb756c5d14ae1commit | diff
Merge branch 'rr/fi-import-marks-if-exists'

* rr/fi-import-marks-if-exists:
  fast-import: Introduce --import-marks-if-exists
Documentation/git-fast-import.txt diff1 | diff2 | blob | history
fast-import.c diff1 | diff2 | blob | history
t/t9300-fast-import.sh diff1 | diff2 | blob | history
Git—the stupid content tracker