Merge branch 'jk/cherry-pick-reword' into maint

[git.git] / git-am.sh

diff --git a/git-am.sh b/git-am.sh
index c8b9cbb101f1319b6efd78ff6ae9c63efcdc991b..3c08d53161faa72744ab64a1391d85cf9243f006 100755 (executable)
--- 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 ;;