![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 17 Jan 2010 23:58:11 +0000 (15:58 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 17 Jan 2010 23:58:11 +0000 (15:58 -0800) | ||
| commit | fa232d457ebc1620ab31be504068c38403497179 | |
| tree | 2a7cb063cb190c00ae276310d49f17f52d3a02b1 | tree | snapshot |
| parent | 703601d6780c32d33dadf19b2b367f2f79e1e34c | commit | diff |
| parent | bc3c79aefc9cdb1127e1dfd22ad19cf6c6e94f09 | commit | 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
* 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 |