summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-03-25 12:54:23 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-03-25 12:54:23 -0700
commitcf07d3fe9068acbd0dd15abeab9370f372a6e26d (patch)
treefe21414207199b195e2093bd7184b897240084bf /Documentation/git-merge.txt
parentMerge branch 'dj/log-graph-with-no-walk' (diff)
parentSubmittingPatches: encourage users to use format-patch and send-email (diff)
downloadtgif-cf07d3fe9068acbd0dd15abeab9370f372a6e26d.tar.xz
Merge branch 'jc/submitting-patches-mention-send-email'
Recommend format-patch and send-email for those who want to submit patches to this project. * jc/submitting-patches-mention-send-email: SubmittingPatches: encourage users to use format-patch and send-email
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions