Add git merge to the expanded numeric commands
Merge pull request #106 from tuxinaut/master

Add git merge to the expanded numeric commands
Added git stash pop alias (gashp)
Addd gmnff gmff alias for git merge --no-ff and --ff
Add note about other aliases.
Merge pull request #113 from brianpeiris/patch-1

Add note about other aliases.
Added additional info about list_alias commands
Updates to README
Add an alias to `git commit --verbose`
Merge pull request #107 from g5pw/master

Add ZSH completion support
Add an example alias for `git_commit_verbose_alias` to `git.scmbrc.example`
Add an alias to show a git log with all the branches and remotes
Merge pull request #110 from tuxinaut/master

Git merge aliases
Merge pull request #115 from AzizLight/git-commit-verbose

Add an alias to `git commit --verbose`
Merge pull request #118 from AzizLight/pretty-git-log-all

Add an alias to show a git log with all the branches and remotes
determine extended regex argument for sed, can be -E or -r (fix #112)
Fix git checkout,diff,reset,rm in deleted directories, if pwd is in git dir
Let gs handle commits the branch is behind

Fixes #119
Merge pull request #120 from sblask/fix-issue-119-show-more-information-in-gs

Let gs handle commits the branch is behind
Fix upcoming Git 2.0 breaking change to `git add -A`.