summaryrefslogtreecommitdiff
path: root/merge-recursive.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-01-03 10:29:29 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-01-03 10:29:29 -0800
commitb81827b6b642da698e5d32fb54d74687dcf223cc (patch)
tree0fdc7e9c2b8d2d4981df7c366c0f888ba66db5e8 /merge-recursive.h
parentMerge branch 'as/test-tweaks' (diff)
parentgit-subtree: fix typo in manpage (diff)
downloadtgif-b81827b6b642da698e5d32fb54d74687dcf223cc.tar.xz
Merge branch 'ms/subtree-fixlets'
* ms/subtree-fixlets: git-subtree: fix typo in manpage git-subtree: ignore git-subtree executable
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions