diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-08-27 07:55:10 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-08-27 07:55:10 +0200 |
| commit | 6e6ba65a7c8f8f9556ec42678f661794d47f7f98 (patch) | |
| tree | 3a9714f9a2794a1511d974b79d20e124f2ef6a7d /Documentation/git-merge.txt | |
| parent | Merge branch 'jt/packmigrate' (diff) | |
| parent | merge: save merge state earlier (diff) | |
| download | git-6e6ba65a7c8f8f9556ec42678f661794d47f7f98.tar.xz git-6e6ba65a7c8f8f9556ec42678f661794d47f7f98.zip | |
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.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index 6b308ab6d0..615e6bacde 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: |