Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Documentation/git-merge: explain --continue
author
Michael J Gruber
<git@grubix.eu>
Mon, 21 Aug 2017 12:53:14 +0000
(14:53 +0200)
committer
Junio C Hamano
<gitster@pobox.com>
Tue, 22 Aug 2017 00:12:44 +0000
(17:12 -0700)
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>
Documentation/git-merge.txt
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(from parent 1:
4d7268b
)
diff --git
a/Documentation/git-merge.txt
b/Documentation/git-merge.txt
index 04fdd8cf086db6413a01421c306a80c9583f7fa4..f90faf7aaa250b2fea09d611e4efac31968ce6db 100644
(file)
--- 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: