From: Jonathan Nieder <jrnieder@gmail.com>
To: Andrew Wong <andrew.w@sohovfx.com>
Cc: Ramkumar Ramachandra <artagnon@gmail.com>,
Andrew Wong <andrew.kw.w@gmail.com>,
git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>,
Jay Soffian <jaysoffian@gmail.com>
Subject: Re: [PATCH] rebase -i: remove CHERRY_PICK_HEAD when cherry-pick failed
Date: Wed, 4 Apr 2012 15:20:05 -0500 [thread overview]
Message-ID: <20120404202005.GC17544@burratino> (raw)
In-Reply-To: <20120404201610.GB17544@burratino>
Jonathan Nieder wrote:
> - when "git cherry-pick" performs a merge and encounters conflicts,
> it prints a message and exits, writing CHERRY_PICK_HEAD to tell
> the operator what command to use (instead of "git commit" or
> "git cherry-pick --continue") when the problem is resolved.
The above paragraph doesn't make any sense. I meant:
When cherry-pick encounters conflicts, it prints a message
telling the operator what command to use (namely "git commit"
or "git cherry-pick --continue") once the problem is resolved
and writes CHERRY_PICK_HEAD to make that command work.
Sorry for the noise.
> If my script sets GIT_CHERRY_PICK_HELP, it will print a different
> message and cherry-pick does not write CHERRY_PICK_HEAD because
> the operator is going to run "myscript --resume" instead of
> "git commit" or "git cherry-pick --continue" when the problem is
> resolved.
Jonathan
prev parent reply other threads:[~2012-04-04 20:20 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-31 22:56 Rebase regression in v1.7.9? Felipe Contreras
2012-02-01 17:27 ` Andrew Wong
2012-02-01 19:30 ` Felipe Contreras
2012-03-18 21:37 ` [PATCH] rebase -i: remove CHERRY_PICK_HEAD when cherry-pick failed Andrew Wong
2012-03-19 16:51 ` Junio C Hamano
2012-03-19 21:00 ` Andrew Wong
2012-03-24 20:03 ` Andrew Wong
2012-04-02 22:38 ` Andrew Wong
2012-04-02 23:08 ` Junio C Hamano
2012-04-03 5:15 ` Junio C Hamano
2012-04-03 6:32 ` Ramkumar Ramachandra
2012-04-03 14:45 ` Jonathan Nieder
2012-04-03 21:01 ` Andrew Wong
2012-04-03 21:08 ` Jonathan Nieder
2012-04-03 21:12 ` Jonathan Nieder
2012-04-03 21:22 ` Andrew Wong
2012-04-03 21:26 ` Jonathan Nieder
2012-04-03 23:11 ` Andrew Wong
2012-04-04 18:11 ` Jonathan Nieder
2012-04-04 19:23 ` Andrew Wong
2012-04-04 20:16 ` Jonathan Nieder
2012-04-04 20:20 ` Jonathan Nieder [this message]
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=20120404202005.GC17544@burratino \
--to=jrnieder@gmail.com \
--cc=andrew.kw.w@gmail.com \
--cc=andrew.w@sohovfx.com \
--cc=artagnon@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jaysoffian@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.