Differences
This shows you the differences between two versions of the page.
| Both sides previous revision Previous revision | |||
|
git:tips [2009/07/02 12:01] klaus3000 |
git:tips [2009/07/21 14:35] (current) andrei --rebase to git pull, in case there are local changes on the local master |
||
|---|---|---|---|
| Line 75: | Line 75: | ||
| # cleanup: change into another local branch and delete the local avpops branch | # cleanup: change into another local branch and delete the local avpops branch | ||
| git checkout master | git checkout master | ||
| - | git pull # fetch previously commited commit | + | git pull --rebase origin master |
| git branch -d darilion/ | git branch -d darilion/ | ||
| </ | </ | ||
