From: Junio C Hamano Date: Thu, 15 Jan 2009 00:43:14 GMT Subject: Re: [RFC PATCH] Make the rebase edit mode really end up in an edit state Message-ID: <7vfxjlxuu5.fsf@gitster.siamese.dyndns.org> In-Reply-To: <87ab9th0rh.fsf@cup.kalibalik.dk> Anders Melchiorsen writes: > I always have a hard time figuring out what to do during an > interactive rebase. Recently, it dawned on me that the reason is that > I have to do different things: one thing when editing on purpose, and > a different thing when resolving a conflict. So my fingers never learn. > > With this change, I propose to make the UI more uniform. I think that > the new way is more intuitive, too, if you will agree that a Git UI > can be intuitive. > > As I expect this to not be acceptable due to compatibility concerns, I > have not tested it much. The patch is mostly to catch some attention, > but I will be happy to complete it if there is interest in the change. > > It was surprising for me to find the needed code already present. Now > I know that I do not have to do "git commit --amend", it will happen > automatically if I add some files. That trick alone is worth the time > that I have spent on this :-). We may need a version bump to 1.7.0 to update the UI for this command, but please do test rigorously to build a stronger case for a saner UI. I've always had trouble with the instruction we give for splitting one commit into two using the interactive rebase in the documentation, as it always had a strong "Huh?" effect on me when it suddenly starts talking about doing a "git reset HEAD^"; I suspect your change may improve this situation quite a bit.