summaryrefslogtreecommitdiff
path: root/git-am.sh
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2010-02-11 17:27:14 -0500
committerJunio C Hamano <gitster@pobox.com>2010-02-11 22:10:00 -0800
commitc8089af6c6754153d75de74d0f147adcd46a6b59 (patch)
tree8090406f0146e1168796d05880715771ed561981 /git-am.sh
parentf476c0b7b30b26157b4a12b565a08a3c015edf6d (diff)
downloadgit-c8089af6c6754153d75de74d0f147adcd46a6b59.tar.gz
am: switch --resolved to --continue
Rebase calls this same function "--continue", which means users may be trained to type it. There is no reason to deprecate --resolved (or -r), so we will keep it as a synonym. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-am.sh')
-rwxr-xr-xgit-am.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/git-am.sh b/git-am.sh
index c8b9cbb101..3c08d53161 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -25,7 +25,8 @@ p= pass it through git-apply
patch-format= format the patch(es) are in
reject pass it through git-apply
resolvemsg= override error message when patch failure occurs
-r,resolved to be used after a patch failure
+continue continue applying patches after resolving a conflict
+r,resolved synonyms for --continue
skip skip the current patch
abort restore the original branch and abort the patching operation.
committer-date-is-author-date lie about committer date
@@ -318,7 +319,7 @@ do
scissors=t ;;
--no-scissors)
scissors=f ;;
- -r|--resolved)
+ -r|--resolved|--continue)
resolved=t ;;
--skip)
skip=t ;;