config.txt: move merge-config.txt to config/

diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index 460662e4b92b56c25989c9d1770165ea9a6a16a2..6f6c34b0f4bc9ba18ec890dff1a6fe10af2fd68f 100644 (file)
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@ -16,7 +16,7 @@ SYNOPSIS
         [--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet]
         [--[no-]scissors] [-S[<keyid>]] [--patch-format=<format>]
         [(<mbox> | <Maildir>)...]
-'git am' (--continue | --skip | --abort | --quit)
+'git am' (--continue | --skip | --abort | --quit | --show-current-patch)
 
 DESCRIPTION
 -----------
@@ -171,6 +171,10 @@ default.   You can use `--no-utf8` to override this.
        Abort the patching operation but keep HEAD and the index
        untouched.
 
+--show-current-patch::
+       Show the patch being applied when "git am" is stopped because
+       of conflicts.
+
 DISCUSSION
 ----------