summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-07-21 22:51:45 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-07-21 22:51:45 -0700
commit281ff456fe94e043e3f65f224683b42b5667cd85 (patch)
treeaba046360d3c9df35d3777b098f3d8999e74a159 /Documentation/git-merge.txt
parentMerge branch 'dk/maint-t5150-dirname' into maint (diff)
parentfetch-options.txt: prevent a wildcard refspec from getting misformatted (diff)
downloadtgif-281ff456fe94e043e3f65f224683b42b5667cd85.tar.xz
Merge branch 'rr/maint-fetch-tag-doc-asterisks' into maint
* rr/maint-fetch-tag-doc-asterisks: fetch-options.txt: prevent a wildcard refspec from getting misformatted
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions