Git vs. Mercurial workflow

(1) Get latest from remote

git checkout master
git pull

hg pull

(2) Commit work

git add <file>
git commit -am "added feature"

hg add <file>
hg commit -m "added feature"

(3) Push commit to remote

git push

hg push

(4) Update with latest changes on master

git pull --rebase

hg pull
hg merge

(*) Forget file

git rm --cached <file>

Repeat 2 and 3

Work in branch

Create branch

git checkout -b my_branch

Push to remote branch

git push origin HEAD:my_branch

git config --global http.proxy http://23xxxxxx:password@proxy.seld.sonyericsson.net:8080