path: root/
diff options
authorJeff King <>2010-02-11 22:27:14 (GMT)
committerJunio C Hamano <>2010-02-12 06:10:00 (GMT)
commitc8089af6c6754153d75de74d0f147adcd46a6b59 (patch)
tree8090406f0146e1168796d05880715771ed561981 /
parentf476c0b7b30b26157b4a12b565a08a3c015edf6d (diff)
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 <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to '')
1 files changed, 3 insertions, 2 deletions
diff --git a/ b/
index c8b9cbb..3c08d53 100755
--- a/
+++ b/
@@ -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 ;;
scissors=f ;;
- -r|--resolved)
+ -r|--resolved|--continue)
resolved=t ;;
skip=t ;;