summaryrefslogtreecommitdiff
path: root/git-am.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-10-21 17:16:04 -0700
committerJunio C Hamano <gitster@pobox.com>2010-10-21 17:16:10 -0700
commitd4c436975214d8f94d38f9be0ef709b4714fc821 (patch)
treeae0ecf02aedd1340a02cb3d9e9b479629e8dcd70 /git-am.sh
parent1bb28d87e1d8897db662f48455d369860758fbdd (diff)
parent8a90438506d3b7c8ef8bd802b7ed10c1f12da1d0 (diff)
downloadgit-d4c436975214d8f94d38f9be0ef709b4714fc821.tar.gz
Sync with 1.7.3.2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-am.sh')
-rwxr-xr-xgit-am.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-am.sh b/git-am.sh
index 10436dcad5..df09b42840 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -5,7 +5,7 @@
SUBDIRECTORY_OK=Yes
OPTIONS_KEEPDASHDASH=
OPTIONS_SPEC="\
-git am [options] [<mbox>|<Maildir>...]
+git am [options] [(<mbox>|<Maildir>)...]
git am [options] (--resolved | --skip | --abort)
--
i,interactive run interactively