summaryrefslogtreecommitdiff
path: root/Documentation/howto/using-merge-subtree.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-06-01 14:02:52 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-06-01 14:02:52 -0700
commit2dd798469e5ca7792735475fa5844698a02cca70 (patch)
tree855da80a8305addacb36bbeb7446d771626dad69 /Documentation/howto/using-merge-subtree.txt
parentMerge branch 'jn/doc-remote-helpers' into maint (diff)
parentdocs: fix some antique example output (diff)
downloadtgif-2dd798469e5ca7792735475fa5844698a02cca70.tar.xz
Merge branch 'jk/maint-docs' into maint
* jk/maint-docs: docs: fix some antique example output docs: make sure literal "->" isn't converted to arrow docs: update status --porcelain format docs: minor grammar fixes to git-status
Diffstat (limited to 'Documentation/howto/using-merge-subtree.txt')
0 files changed, 0 insertions, 0 deletions