add sha, which-branch to gitconfig. add is_ssh.

This commit is contained in:
2014-04-13 22:47:40 -07:00
parent 56342141da
commit 322f862e76
4 changed files with 18 additions and 4 deletions

View File

@@ -15,9 +15,15 @@
reb = "!r() { git rebase -i HEAD~$1; }; r"
suir = submodule update --init --recursive
poh = push origin HEAD
pohm = push origin HEAD:master
# Diff a file or show it in git's pager if it is untracked
du = "!d() { git ls-files $1 --error-unmatch 2>/dev/null 1>/dev/null && git diff $1 || `git config --get core.pager` $1; }; d"
which-branch = symbolic-ref HEAD --short
sha = rev-parse HEAD
branch-or-sha = "!bs() { git which-branch 2> /dev/null || git sha 2> /dev/null ; }; bs"
amend = commit -a --amend -C HEAD
reset-origin = "r() {git reset --hard origin/$(git symbolic-ref HEAD); git suir}"
reset-origin = "!r() { git reset --hard origin/\"$(git parse-branch)\" && git suir; }; r"
[core]
# Use custom `.gitignore` and `.gitattributes`
@@ -59,4 +65,4 @@
name = Ivan Malison
[merge]
conflictstyle = diff3
conflictstyle = diff3