summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-tree.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-05-21 04:02:19 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-05-21 04:02:19 -0700
commit465ef577b59986d70c51ea72dd3f87759b2bcd4f (patch)
tree0cd039e3f6d84a2fd4fac90b6966aedc24116147 /Documentation/git-merge-tree.txt
parentMerge branch 'np/index-pack-memsave' (diff)
parentt7400: clarify submodule update tests (diff)
downloadtgif-465ef577b59986d70c51ea72dd3f87759b2bcd4f.tar.xz
Merge branch 'jn/submodule-basic-test'
* jn/submodule-basic-test: t7400: clarify submodule update tests t7400: clarify 'submodule add' tests t7400: split setup into multiple tests
Diffstat (limited to 'Documentation/git-merge-tree.txt')
0 files changed, 0 insertions, 0 deletions