Hi, On Thu, 26 Jun 2008, Dmitry Potapov wrote: > -- >8 -- > From: Dmitry Potapov <dpotapov@xxxxxxxxx> > Date: Wed, 25 Jun 2008 23:23:22 +0400 > Subject: [PATCH] don't allow 'commit --amend' during rebase conflict resolution This is a very funny way to interpret the SubmittingPatches document. Just stating a fact here. > Running 'commit --amend' during git rebase is almost certainly a > mistake, which causes that two consequent patches are squashed together. > Moreover, the commit message of the second commit is silently lost. It > is almost certainly not what the user expects. In that very unlikely > case when you really want to combine two patches during rebase conflict > resolution, you can do that using "git reset --soft HEAD^" followed by > "git commit". NACK. You just broke the 'edit' command. Ciao, Dscho -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
