summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-08-27 05:55:10 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-08-27 05:55:10 (GMT)
commit6e6ba65a7c8f8f9556ec42678f661794d47f7f98 (patch)
tree3a9714f9a2794a1511d974b79d20e124f2ef6a7d /Documentation/git-merge.txt
parenteabdcd4ab4b04af8f39e5ea3847b6d364acb874e (diff)
parent9d89b35526b54c3ba33371b184a1ba6e30f8f46f (diff)
downloadgit-6e6ba65a7c8f8f9556ec42678f661794d47f7f98.zip
git-6e6ba65a7c8f8f9556ec42678f661794d47f7f98.tar.gz
git-6e6ba65a7c8f8f9556ec42678f661794d47f7f98.tar.bz2
Merge branch 'mg/killed-merge'
Killing "git merge --edit" before the editor returns control left the repository in a state with MERGE_MSG but without MERGE_HEAD, which incorrectly tells the subsequent "git commit" that there was a squash merge in progress. This has been fixed. * mg/killed-merge: merge: save merge state earlier merge: split write_merge_state in two merge: clarify call chain Documentation/git-merge: explain --continue
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 6b308ab..615e6ba 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -288,7 +288,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: