[master]% gb dog
[master]% go dog
[dog]% vi ilikedogs.c
....
u work in dog and never flip back to master
u like the dog changes
u want to keep the series of commits u did in dog
u r finished with dog
u want dog changes applied to master
u don't want the merge commit that git pull does
...
[dog]% go master
[master]% git pull --rebase . dog
From .* branch dog -> FETCH_HEAD
1rst, rewind head to replay your work on top of it
Fast-forwarded master to ...fdfdea5.
No comments:
Post a Comment