Andrew's git / gitweb.git / diff
?
Merge branch 'sr/gfi-options'
authorJunio C Hamano <gitster@pobox.com>
Sun, 17 Jan 2010 23:58:11 +0000 (15:58 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 17 Jan 2010 23:58:11 +0000 (15:58 -0800)
* sr/gfi-options:
fast-import: add (non-)relative-marks feature
fast-import: allow for multiple --import-marks= arguments
fast-import: test the new option command
fast-import: add option command
fast-import: add feature command
fast-import: put marks reading in its own function
fast-import: put option parsing code in separate functions

1  2 
Documentation/git-fast-import.txt patch | diff1 | diff2 | blob | history
fast-import.c patch | diff1 | diff2 | blob | history
diff --cc Documentation/git-fast-import.txt
Simple merge
diff --cc fast-import.c
Simple merge