Tuesday, October 16, 2012

Git reminder


Just a git reminder to work with github ...

git checkout master
git fetch upstream
git merge upstream/master


git checkout dashboard
git merge upstream/dashboard

git push --set-upstream origin dashboard


Merge


git mergetool -t kdiff3
git mergetool -t meld
git config --global merge.tool kdiff3

Clean d'un repository :

For example,

git fetch upstream
git checkout master
git reset --hard upstream/master  
git push origin master --force 


Revert

  • git checkout path/to/file
  • For a working copy : git reset --hard