Allow add_path() to add non-existent directories to the path

[git.git] / git-am.sh

diff --git a/git-am.sh b/git-am.sh
index 7864b5f58826a6964f85feae5d8ab90cfcfe59af..6aa819280ef99ccbbdeefde037e99fae3e6f0110 100755 (executable)
--- a/git-am.sh
+++ b/git-am.sh
@@ -6,8 +6,7 @@ SUBDIRECTORY_OK=Yes
 OPTIONS_KEEPDASHDASH=
 OPTIONS_SPEC="\
 git am [options] [<mbox>|<Maildir>...]
-git am [options] --resolved
-git am [options] --skip
+git am [options] (--resolved | --skip | --abort)
 --
 d,dotest=       (removed -- do not use)
 i,interactive   run interactively
@@ -456,7 +455,7 @@ do
                stop_here $this
        fi
 
-       printf 'Applying %s\n' "$FIRSTLINE"
+       printf 'Applying: %s\n' "$FIRSTLINE"
 
        case "$resolved" in
        '')