Re: git cherry-pick --continue?
- From
Jeff King <peff@peff.net>
- Date
- Feb 10, 2010, 21:24 UTC
- Message-ID
- <20100210212408.GB7728@coredump.intra.peff.net>
- In-Reply-To
- <20100210210419.GA7728@coredump.intra.peff.net>
On Wed, Feb 10, 2010 at 04:04:19PM -0500, Jeff King wrote:
> [1] On the other hand, I usually mistype that as "git am --continue", > which _does_ make sense, since you are applying a sequence of patches. > Maybe "am" should support both.
Hmm. I was thinking "am" was the odd man out, but really there are only two sequencer commands that I noted: rebase and am. So you could perhaps argue that rebase should also learn "--resolved". Or am I forgetting one?
I find the patch below convenient. I dunno if anybody else actually cares.
-- >8 -- Subject: [PATCH] am: allow --continue as a synonym for --resolved
Rebase calls this same function "--continue", which means users may be trained to type it. There is no reason to deprecate --resolved (or -r), but adding this synonym is friendly to users.
Signed-off-by: Jeff King <peff@peff.net> --- git-am.sh | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/git-am.sh b/git-am.sh index c8b9cbb..88cef39 100755 --- a/git-am.sh +++ b/git-am.sh @@ -26,6 +26,7 @@ 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 synonym for --resolved 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 ;;
-- 1.7.0.rc2.22.g0716c.dirty