From e2de82f27128441278da979ef101239c40188064 Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Mon, 21 Aug 2017 14:53:14 +0200 Subject: [PATCH] Documentation/git-merge: explain --continue Currently, 'git merge --continue' is mentioned but not explained. Explain it. Signed-off-by: Michael J Gruber Signed-off-by: Junio C Hamano --- Documentation/git-merge.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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: -- 2.11.4.GIT