summaryrefslogtreecommitdiff
path: root/Documentation/howto/using-merge-subtree.txt
diff options
context:
space:
mode:
authorLibravatar Michael J Gruber <git@grubix.eu>2017-08-21 14:53:14 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-08-21 17:12:44 -0700
commite2de82f27128441278da979ef101239c40188064 (patch)
tree0bd37d3e7c5b12f04ebafed232bee7f3000ca191 /Documentation/howto/using-merge-subtree.txt
parentGit 2.14.1 (diff)
downloadtgif-e2de82f27128441278da979ef101239c40188064.tar.xz
Documentation/git-merge: explain --continue
Currently, 'git merge --continue' is mentioned but not explained. Explain it. Signed-off-by: Michael J Gruber <git@grubix.eu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/howto/using-merge-subtree.txt')
0 files changed, 0 insertions, 0 deletions