aboutsummaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-01-17 15:58:11 -0800
committerJunio C Hamano <gitster@pobox.com>2010-01-17 15:58:11 -0800
commitfa232d457ebc1620ab31be504068c38403497179 (patch)
tree2a7cb063cb190c00ae276310d49f17f52d3a02b1 /diff.c
parent703601d6780c32d33dadf19b2b367f2f79e1e34c (diff)
parentbc3c79aefc9cdb1127e1dfd22ad19cf6c6e94f09 (diff)
downloadgit-fa232d457ebc1620ab31be504068c38403497179.tar.gz
git-fa232d457ebc1620ab31be504068c38403497179.tar.xz
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
Diffstat (limited to 'diff.c')
0 files changed, 0 insertions, 0 deletions