summaryrefslogtreecommitdiff
path: root/Documentation/howto/using-merge-subtree.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-09-05 14:41:40 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-09-05 14:41:40 -0700
commitd2dbd399fa03b37ce797ed6fc609574a7e677079 (patch)
treee594a762555b0afe94b675d5b57e55f5d54f64c3 /Documentation/howto/using-merge-subtree.txt
parentUpdate draft release notes after merging the first batch of topics (diff)
parentMerge branch 'nd/fetch-pack-shallow-fix' into maint (diff)
downloadtgif-d2dbd399fa03b37ce797ed6fc609574a7e677079.tar.xz
Sync with maint
* maint: Documentation/git-merge.txt: fix formatting of example block
Diffstat (limited to 'Documentation/howto/using-merge-subtree.txt')
0 files changed, 0 insertions, 0 deletions