On Tue, Mar 17, 2009 at 12:44:31PM -0400, John Dlugosz wrote: > > > You checkout master before updating it? > > > > You cannot merge/rebase a branch unless it is checked out. > > > Sure you can. > git rebase upstream topic This literally does a "checkout" behind the scenes, so it is still manipulating your working tree. It is basically the equivalent of: git checkout topic && git rebase upstream The actual rebasing happens on a detached HEAD, but you will find at the end of such a rebase that you are now on the branch "topic". -Peff -- 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