2010年2月24日 星期三

How to move a big branches to a new base?

http://marc.info/?l=git&m=126715471207185&w=2

I have a branch that have about 10 descendent branches. Now I would like to move this branch, and all the descendent branches, to a new base, and I might need to do so quiet frequently.

My "dirty" way is to rebase step by step, it takes about 15-20 rebases, but the branches is somehow complicated, and this seems error-prone to me.

Is there a clean way to do so?

git: squash my commit?
http://stackoverflow.com/questions/204461/git-squash-my-commit

squashing commits with rebase
http://www.gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html

git awsome-ness [git rebase --interactive]
http://blog.madism.org/index.php/2007/09/09/138-git-awsome-ness-git-rebase-interactive


A successful Git branching model
http://nvie.com/git-model

git pull (w/ --ff) : fetch and merge with fast forwarding
git pull --no-ff : fetch and merge without fast forwarding
git pull --rebase : fetch and rebase

merge/rebase

Use merge instead for temporary tests: merge master to the target branch.

沒有留言: