summaryrefslogtreecommitdiff
path: root/git-am.sh
diff options
context:
space:
mode:
authorKevin Bracey <kevin@bracey.fi>2013-06-26 20:06:41 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-06-27 16:37:12 (GMT)
commit8ceb6fbd63e2b3b82bbca0139a1696955aa753c6 (patch)
treeeac0b847a1a57ec6faec225feed4fd76452d0685 /git-am.sh
parent85318f521f6c0b9843d6da12abf67f2de7608431 (diff)
downloadgit-8ceb6fbd63e2b3b82bbca0139a1696955aa753c6.zip
git-8ceb6fbd63e2b3b82bbca0139a1696955aa753c6.tar.gz
git-8ceb6fbd63e2b3b82bbca0139a1696955aa753c6.tar.bz2
am: replace uses of --resolved with --continue
git am was previously modified to provide --continue for consistency with rebase, merge etc, and the documentation changed to showing --continue as the primary form. Complete the work by replacing remaining uses of --resolved by --continue, most notably in suggested command reminders. Signed-off-by: Kevin Bracey <kevin@bracey.fi> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-am.sh')
-rwxr-xr-xgit-am.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/git-am.sh b/git-am.sh
index 9f44509..7ea40fe 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -6,7 +6,7 @@ SUBDIRECTORY_OK=Yes
OPTIONS_KEEPDASHDASH=
OPTIONS_SPEC="\
git am [options] [(<mbox>|<Maildir>)...]
-git am [options] (--resolved | --skip | --abort)
+git am [options] (--continue | --skip | --abort)
--
i,interactive run interactively
b,binary* (historical option -- no-op)
@@ -102,7 +102,7 @@ stop_here_user_resolve () {
printf '%s\n' "$resolvemsg"
stop_here $1
fi
- eval_gettextln "When you have resolved this problem, run \"\$cmdline --resolved\".
+ eval_gettextln "When you have resolved this problem, run \"\$cmdline --continue\".
If you prefer to skip this patch, run \"\$cmdline --skip\" instead.
To restore the original branch and stop patching, run \"\$cmdline --abort\"."
@@ -523,7 +523,7 @@ Use \"git am --abort\" to remove it.")"
esac
fi
- # Make sure we are not given --skip, --resolved, nor --abort
+ # Make sure we are not given --skip, --continue, nor --abort
test "$skip$resolved$abort" = "" ||
die "$(gettext "Resolve operation not in progress, we are not resuming.")"
@@ -670,7 +670,7 @@ do
# - patch is the patch body.
#
# When we are resuming, these files are either already prepared
- # by the user, or the user can tell us to do so by --resolved flag.
+ # by the user, or the user can tell us to do so by --continue flag.
case "$resume" in
'')
if test -f "$dotest/rebasing"