diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-01-03 10:29:29 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-01-03 10:29:29 -0800 |
commit | b81827b6b642da698e5d32fb54d74687dcf223cc (patch) | |
tree | 0fdc7e9c2b8d2d4981df7c366c0f888ba66db5e8 /merge-recursive.h | |
parent | Merge branch 'as/test-tweaks' (diff) | |
parent | git-subtree: fix typo in manpage (diff) | |
download | tgif-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