From: J. Bruce Fields <bfields@fieldses.org>
Date: Thu, 10 May 2007 17:14:57 GMT
Subject: Re: Merging commits together into a super-commit
Message-ID: <20070510171457.GK13719@fieldses.org>
In-Reply-To: <87wszg39cp.wl%cworth@cworth.org>

On Thu, May 10, 2007 at 09:57:10AM -0700, Carl Worth wrote:
> I'm sure the most complex form of git-rebase solves some precise
> problem that someone has, (and maybe even gets used regularly). But
> it's got enough complications that I just ignore it, (and would
> instead really prefer being able to just cherry-pick a whole range).

I use it all the time to fix up old commits with

	git checkout sha1-of-bad-commit
	...edit, test,...
	git commit -a ---amend
	git rebase --onto HEAD sha1-of-bad-commit original-branch

But though it usually does what I want, I'm in total agreement about the
confusing syntax and branch-switching behavior....

--b.