[PATCH v2 1/3] Documentation/git-merge: explain --continue

From

Michael J Gruber <git@grubix.eu>

Date

Aug 21, 2017, 12:53 UTC

Message-ID

<ddd9c06813f8e2e9d8160f2ed965e728190bc573.1503319519.git.git@grubix.eu>

In-Reply-To

<fe681e447791ded6db52ccd84e64e3637c08ffe5.1503309751.git.git@grubix.eu>

Currently, 'git merge --continue' is mentioned but not explained.

Explain it.

Signed-off-by: Michael J Gruber <git@grubix.eu>
---
 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 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:
 

-- 
2.14.1.364.ge466dba5f7