Differences
This shows you the differences between two versions of the page.
Both sides previous revisionPrevious revision | Next revisionBoth sides next revision | ||
dev:howto:git [2009/08/14 00:43] – tips and tricks section moved to dev:howto:git-tips-and-tricks kelnos | dev:howto:git [2009/08/14 04:23] – simplify kelnos | ||
---|---|---|---|
Line 108: | Line 108: | ||
$ git checkout master | $ git checkout master | ||
$ git checkout -b new-drawing | $ git checkout -b new-drawing | ||
- | $ git pull ../ | + | $ git fetch ../ |
- | $ git reset --hard new-drawing | + | |
$ git log tmpbranch</ | $ git log tmpbranch</ | ||
Line 123: | Line 122: | ||
< | < | ||
$ git cherry-pick e3633d52774bd9a2a20ef9af37d3f72f964a2f54</ | $ git cherry-pick e3633d52774bd9a2a20ef9af37d3f72f964a2f54</ | ||
+ | |||
+ | (Note: if there' | ||
Now, if I got any merge errors after one of the cherry pick commands, I'd have to stop there and fix it up first: | Now, if I got any merge errors after one of the cherry pick commands, I'd have to stop there and fix it up first: |