From: Wincent Colaiuta Date: Mon, 26 Nov 2007 11:27:13 GMT Subject: Re: Rebase/cherry-picking idea Message-ID: In-Reply-To: El 26/11/2007, a las 10:32, Benoit Sigoure escribió: > On Nov 26, 2007, at 10:02 AM, Wincent Colaiuta wrote: > >> 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. Looks like you're right. I just did a simple test and it turns out that after a conflict, this: git commit -c ... git rebase --continue Produces exactly the same history as this: git rebase --continue So I think that misleading noise needs to be suppressed or reworded when rebasing. Will look into it. Cheers, Wincent