Re: Heads up: major rebase -i -p rework coming up
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Jan 24, 2009, 21:09 UTC
- Message-ID
- <alpine.DEB.1.00.0901242206540.14855@racer>
- In-Reply-To
- <alpine.DEB.1.00.0901242156320.14855@racer>
Hi,
On Sat, 24 Jan 2009, Johannes Schindelin wrote:
Show 24 quoted lines
> > - Why do you need "merge D' was E"? Shouldn't "pick E" be able to > > notice that E is a merge and decompose it into "merge D' was E" > > internally? > > > > This one I am somewhat complaining, unless your answer is "because > > this way the user could drop some parents from the merge in the > > editor". > > Not only that; the user could use this to fix mismerges, i.e. by > replacing a SHA-1 with the SHA-1 (or indeed, a short name, unless it is > "was") of the branch that she _actually_ wanted to merge with. > > > And if your answer is that, then my next question will be "if that > > is the case, can the user be expected to easily find out which > > commit each parent SHA-1 refers to, without having more hint on the > > 'merge' insn line?" > > Nope. > > In most cases, however, that should be plenty enough: > > merge 9383af1' was f39d50a Merge branch 'mh/unify-color' into next > > The user does not have to guess much what 9383af1 might refer to.
Heh, I think it is much easier than I thought: How about this?
merge 9383af1' was f39d50a Merge branch 'mh/unify-color' into next # \ 9383af1 Revert previous two commits
Obviously, for octopodes, there would be multiple "# \ <SHA-1> <oneline>" lines...
Ciao, Dscho