Merge branch 'jk/pull-to-integrate'

diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 1bcf11b3971e7c09128f043b560c66af41332d79..e364007d7c2e5f9b1aa5472c7968cb248eb8cf3f 100644 (file)
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -1841,7 +1841,7 @@ Once the index is updated with the results of the conflict
 resolution, instead of creating a new commit, just run
 
 -------------------------------------------------
-$ git am --resolved
+$ git am --continue
 -------------------------------------------------
 
 and Git will create the commit for you and continue applying the