diff options
| author |  Michael J Gruber <git@grubix.eu> | 2017-08-21 14:53:14 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-08-21 17:12:44 -0700 |
| commit | e2de82f27128441278da979ef101239c40188064 (patch) | |
| tree | 0bd37d3e7c5b12f04ebafed232bee7f3000ca191 /Documentation | |
| parent | Git 2.14.1 (diff) | |
| download | tgif-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')
| -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 04fdd8cf08..f90faf7aaa 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: |