Git

$ git pull --rebase origin master

$ git add <conflict_file>
$ git rebase --continue

$ git rebase -i origin master

Rebase with the master
$ git rebase -i HEAD~5

git push (after rebase)

$ git push origin --force-with-lease

http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html
https://gist.github.com/octacian/99d3996dc8835167b5d9460658a36f3e

Squash commits

$ git reset head~n
$ git add .
$ git commit -m '<squashed msg>'
$ git push origin <branch-name> --force

git merge master

$ git checkout master
$ git pull
$ git checkout <branch>
$ git merge master

$ git stash list

$ git stash show (inspect)

$ git stash apply (restore)

$ git reset

$ git add .

Add files to staging area.

$ git commit -m 'committing added changes'

Commit changes with comment
eg. git commit -m 'Alice: fix xyz bug. (ALICE-401)'

$ git branch

Show the name of current branch

$ git checkout -b 'name of new branch'

Create a new branch
eg. git checkout -b 'alice-add-new-feature'

$ git push

git push origin 'alice-add-new-feature'
git push origin 'alice-add-new-feature'--force

$ git reset

unstage all

$ git commit --amend

Changing last commit message.

$ git diff --name-only HEAD~0 HEAD~2

Display the list of files changed between 2 commits.

$ git push --force-with-lease origin branch-name

error: failed to push some refs to 'gitolite@gitlab.grass.corp:p/higgs.git'
http://movingfast.io/articles/git-force-pushing/

Check out one file from master.

$ git checkout -- protobuf/emscentral.proto
$ git checkout origin/master -- protobuf/emscentral.proto