My git commands

git

Status between branches
git diff --name-status master..branch_name


Merging while ignoring some files
git merge --no-commit --no-ff branch_name 
git reset /path/to/ignored


Tags
git tag -l 'v1.4.2.*'


git tag -a v1.4 -m 'my version 1.4'
git push --tags


Override local
git fetch --all && git reset --hard origin/master

Delete a remote branch
git push origin --delete branch_name
git branch -D macports 


Fix a commit message
git commit --amend -m "Fixed commit message"
git push <remote> <branch> --force

#To pipe the output to other commands
git status -s

# Do git pull --rebase stashing and un-stashing
git config pull.rebase true
git config rebase.autoStash true