Re: git rebase -i

From: Theodore Tso <tytso@mit.edu>
Date: Feb 19, 2009, 14:57 UTC
Message-ID: <20090219145715.GC14810@mini-me.lan>
In-Reply-To: <20090219102053.GA17417@coredump.intra.peff.net>

On Thu, Feb 19, 2009 at 05:20:53AM -0500, Jeff King wrote:

Show 7 quoted lines

> > Yes, I do the same. But notice that you did "git rebase -i -- 
> > >>>origin<<<---". Seems to me you are definitely _thinking_ in terms of 
> > your topic _branch_ and not in terms of "the last few commits".
> 
> Perhaps. I think of it as "the set of commits not yet published"
> (since I publish only by sending patches to Junio, and he is my origin)
> and nothing to do with the topic branch itself.

Indeed, I bet most people who use this workflow think of git rebase -i origin or "git rebase -i HEAD^^^^" (where I normally figure out how many commits I need to go back and type the right number of carets) as a magic command that does what we want, without necessarily thinking about why it works the way that it does.

I can guarantee that most of the time I don't think "hmm, so I'm going to be rebasing my topic branch onto origin so I can make some changes." Nope, it's, "I'm going to futz with the commits to get them just right".

   	     	 	    	     - Ted