projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 703601d bc3c79a)
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)
commitfa232d457ebc1620ab31be504068c38403497179
tree2a7cb063cb190c00ae276310d49f17f52d3a02b1tree | snapshot
parent703601d6780c32d33dadf19b2b367f2f79e1e34ccommit | diff
parentbc3c79aefc9cdb1127e1dfd22ad19cf6c6e94f09commit | diff
Merge branch 'sr/gfi-options'

* 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
Documentation/git-fast-import.txt diff1 | diff2 | blob | history
fast-import.c diff1 | diff2 | blob | history
Git—the stupid content tracker