I’ve been using git for some time now, but as mentioned elsewhere the learning curse for this ‘stupid content tracker’ is quite steep.

Right now I finally seem be getting the hang of it and can use it in a svn like manner.

So we have:

  • adding a file to a reposity: git add <file>
  • committing it to the local branch: git commit -a -m"log"
  • uploading it to the remote master: git push origin master

And the one that took about 2 months to find:

  • updating the master branch with the changes pushed from remote branches: git reset --hard