linux@xxxxxxxxxxx wrote: > I don't want to rebase HEAD on *that*, but rather rebase *that* > on top of the current HEAD. > > Sometimes I have a little debug hack on a branch by itself, and I > discover that I need it again, so I want to rebase it on top of > current development. > > But there's been a LOT of development in the meantime. And if I do > > git-rebase HEAD debug_hack > > git first checks out debug_hack. This takes a while and, more > importantly, every file modified in HEAD...debug_hack has its timestamp > touched and make(1) insists on recompiling it. Heh. For the same reason I also want 'git merge --into that'. I often hack on a topic branch until it has the right shape. One of the changes touches a central file that triggers a complete recompile. Now I want to merge the topic into master (which did not change this central file since the merge-base). Currently, I must checkout master, which touches the file, but if there existed 'merge --into' it could get away without touching the file. -- Hannes - 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
