Re: Rebase/cherry-picking idea

Hi,

On Mon, 26 Nov 2007, Benoit Sigoure wrote:

On Nov 26, 2007, at 10:02 AM, Wincent Colaiuta wrote:

quoted

In using "git-rebase --interactive" to re-order commits you occasionally get
conflicts and will see a message like this:

	When commiting, use the option '-c %s' to retain authorship and
message

I was thinking that it might be nice to stash away this commit id somewhere
in GIT_DIR so that the user didn't have to explicitly remember it, and add a
new switch to git-commit that could be used to automatically use that
stashed commit id, something like:

	git commit --retain

Although I most often see this kind of message in interactive rebasing, the
message is generated in builtin-revert.c when cherry-picking, so you can
also see it in any other situation where you're cherry picking and there's a
conflict.

What do people think? Would this be a nice usability improvement? Or is it
adding clutter?

I'm not sure but I think this message is just some unwanted (misleading)
noise, since when you rebase, once you solve the conflicts, you git-rebase
--continue, you don't git-commit.

Yep.  It is on my TODO list since a long time, but I am just as glad 
somebody else is doing it.  But I have to agree with Hannes that using an 
environment variable is cleaner, more elegant and shorter.

Ciao,
Dscho