summaryrefslogtreecommitdiff
path: root/merge-recursive.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-08-03 11:01:23 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-08-03 11:01:23 -0700
commitc0d503433f99916f727b8ce75be957ee650a4095 (patch)
tree7037bff59cb153e990bf399ef9d739d0c9c4bbb8 /merge-recursive.h
parentMerge branch 'gr/rebase-i-drop-warn' (diff)
parentfast-import: add a get-mark command (diff)
downloadtgif-c0d503433f99916f727b8ce75be957ee650a4095.tar.xz
Merge branch 'mh/fast-import-get-mark'
"git fast-import" learned to respond to the get-mark command via its cat-blob-fd interface. * mh/fast-import-get-mark: fast-import: add a get-mark command
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions