summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-01-11 18:35:07 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-01-11 18:35:08 -0800
commita96e8078a9135f54052ceb93c26adf4b863780ae (patch)
treec2b8b3dc917e426af37c0a19a1afcbeb62a98b38 /merge-recursive.c
parentMerge branch 'jk/shortlog-no-wrap-doc' (diff)
parentgit-fast-import(1): reorganise options (diff)
downloadtgif-a96e8078a9135f54052ceb93c26adf4b863780ae.tar.xz
Merge branch 'jk/maint-fast-import-doc-reorder'
* jk/maint-fast-import-doc-reorder: git-fast-import(1): reorganise options git-fast-import(1): combine documentation of --[no-]relative-marks
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions