From: Jay Soffian <jaysoffian@gmail.com>
To: Jeff King <peff@peff.net>
Cc: Junio C Hamano <gitster@pobox.com>,
Sverre Rabbelier <srabbelier@gmail.com>,
Git List <git@vger.kernel.org>
Subject: Re: git cherry-pick --continue?
Date: Thu, 11 Feb 2010 18:05:18 -0500 [thread overview]
Message-ID: <76718491002111505u2935381erc376cea862e15801@mail.gmail.com> (raw)
In-Reply-To: <20100211211937.GA12752@coredump.intra.peff.net>
On Thu, Feb 11, 2010 at 4:19 PM, Jeff King <peff@peff.net> wrote:
> Automatic cherry-pick failed. After resolving the conflicts,
> mark the corrected paths with 'git add <paths>' or 'git rm <paths>'
> and commit the result with:
>
> git commit -c HEAD~23
>
Blech, how is this an improvement? Why can't I just say "git
cherry-pick --continue"?
If I've still got the message in my terminal, it's no harder to use
the SHA1. And if I've lost the message in my terminal, HEAD~23 is lost
and I've got to dig the SHA1 out of my shell history anyway.
(This isn't hypothetical; typically I'll cherry-pick, do some crap in
that terminal such that the message is lost, then I've got to go
through my history to see which commit I had been cherry picking. So
changing the message doesn't help with that situation at all.)
j.
next prev parent reply other threads:[~2010-02-11 23:05 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-10 20:37 git cherry-pick --continue? Sverre Rabbelier
2010-02-10 21:04 ` Jeff King
2010-02-10 21:24 ` Jeff King
2010-02-10 21:26 ` Sverre Rabbelier
2010-02-10 22:01 ` Junio C Hamano
2010-02-10 22:21 ` Junio C Hamano
2010-02-10 22:23 ` Sverre Rabbelier
2010-02-10 22:34 ` Junio C Hamano
2010-02-10 22:38 ` Sverre Rabbelier
2010-02-11 21:04 ` Jeff King
2010-02-11 21:06 ` [PATCH 1/4] cherry-pick: rewrap advice message Jeff King
2010-02-11 21:06 ` [PATCH 2/4] cherry-pick: refactor commit parsing code Jeff King
2010-02-11 21:07 ` [PATCH 3/4] cherry-pick: format help message as strbuf Jeff King
2010-02-11 21:08 ` [PATCH 4/4] cherry-pick: show commit name instead of sha1 Jeff King
2010-02-11 21:19 ` git cherry-pick --continue? Jeff King
2010-02-11 23:05 ` Jay Soffian [this message]
2010-02-11 23:13 ` Junio C Hamano
2010-02-11 23:57 ` Jeff King
2010-02-11 19:32 ` Jeff King
2010-02-11 20:36 ` Junio C Hamano
2010-02-11 22:27 ` Jeff King
2010-02-12 14:11 ` SZEDER Gábor
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=76718491002111505u2935381erc376cea862e15801@mail.gmail.com \
--to=jaysoffian@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
--cc=srabbelier@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).