summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorMichael J Gruber <git@grubix.eu>2017-08-21 12:53:14 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-08-22 00:12:44 (GMT)
commite2de82f27128441278da979ef101239c40188064 (patch)
tree0bd37d3e7c5b12f04ebafed232bee7f3000ca191 /Documentation/git-merge.txt
parent4d7268b888d7bb6d675340ec676e4239739d0f6d (diff)
downloadgit-e2de82f27128441278da979ef101239c40188064.zip
git-e2de82f27128441278da979ef101239c40188064.tar.gz
git-e2de82f27128441278da979ef101239c40188064.tar.bz2
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/git-merge.txt')
-rw-r--r--Documentation/git-merge.txt5
1 files changed, 4 insertions, 1 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 04fdd8c..f90faf7 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -280,7 +280,10 @@ After seeing a conflict, you can do two things:
* Resolve the conflicts. Git will mark the conflicts in
the working tree. Edit the files into shape and
- 'git add' them to the index. Use 'git commit' to seal the deal.
+ 'git add' them to the index. Use 'git commit' or
+ 'git merge --continue' to seal the deal. The latter command
+ checks whether there is a (interrupted) merge in progress
+ before calling 'git commit'.
You can work through the conflict with a number of tools: