Created
June 1, 2016 04:07
-
-
Save taxilian/3cb85c00c86d858f9eea6fb6da2f36e0 to your computer and use it in GitHub Desktop.
git aliases
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[alias] | |
pr = pull --rebase | |
unadd = reset HEAD | |
#co = checkout | |
co = "!f(){ git checkout \"$@\" && git submodule update --init --recursive; }; f" | |
cp = cherry-pick | |
st = status | |
stat = status | |
br = branch | |
info = "!sh -c '[ $# -ne 0 ] && git remote show $1 && exit 0 || [ $# = 0 ] && git remote show origin && exit 0' -" | |
track = "!sh -c '[ $# = 2 ] && git branch --track \"$1\" \"$2\" && exit 0 || [ $# = 1 ] && git branch --track \"$1\" origin/\"$1\" && exit 0 || echo \"usage: git track <branch> [remote_branch]\\n\\nIf remote branch is not specified, the default is to use origin/<branch>\" && exit 1' -" | |
flush = "!git clean -dxf && git remote prune origin && git gc" | |
pulls = "!f(){ git pull \"$@\" && git submodule update --init --recursive; }; f" | |
# GradeCam specific | |
feature = "!git reset HEAD && git checkout -b feature/\"$1\" && git commit --allow-empty -m \"Created feature branch $1\" && git push --set-upstream origin feature/\"$1\" && echo Branch feature/$1 published to origin" | |
flowrelease = "!git flow release start $1 && git flow release finish $1" | |
pushmrt = "!git push --tags origin release && git push origin master" | |
# The below are courtesy of bobthecow | |
edit-unmerged = "!f() { git ls-files --unmerged | cut -f2 | sort -u ; }; $EDITOR `f`" | |
add-unmerged = "!f() { git ls-files --unmerged | cut -f2 | sort -u ; }; git add `f`" | |
lc = log ORIG_HEAD.. --stat --no-merges | |
smash = merge --no-commit --log | |
eat = branch -M | |
prune-all = !git remote | xargs -n 1 git remote prune | |
whois = "!sh -c 'git log -i --pretty=\"format:%an <%ae>\" --author=\"$1\" | sort -u' -" | |
whatis = show -s --pretty='tformat:%h (%s, %ad)' --date=short | |
this = !git init && ( [[ -n $(ls) ]] || touch .gitignore ) && git add . && git commit -m \"initial commit\" | |
sp = ![[ -z $(git status --porcelain -uno) ]] && git pull --rebase || git stash && git pull --rebase && git stash pop | |
spp = ![[ -z $(git status --porcelain -uno) ]] && git pull --rebase || git stash && git pull --rebase && git push && git stash pop | |
pp = !git pull && git push | |
ppu = !git pp && git submodule sync && git submodule update --init | |
ls = "!git status -suno" | |
ls-modified = "!git status --porcelain -uno | awk 'match($1, /M/) {print $2}'" | |
ls-added = "!git status --porcelain -uno | awk 'match($1, /A/) {print $2}'" | |
ls-deleted = "!git status --porcelain -uno | awk 'match($1, /D/) {print $2}'" | |
ls-renamed = "!git status --porcelain -uno | awk 'match($1, /R/) {print $2}'" | |
ls-copied = "!git status --porcelain -uno | awk 'match($1, /C/) {print $2}'" | |
ls-updated = "!git status --porcelain -uno | awk 'match($1, /U/) {print $2}'" | |
ls-staged = "!git status --porcelain -uno | grep -P '^[MA]' | awk '{ print $2 }'" | |
ls-untracked = "!git status --porcelain -uall | awk '$1 == \"??\" {print $2}'" | |
sup = !git submodule sync && git submodule update --init --recursive | |
# install t first: http://github.com/sjl/t | |
todo = !python ~/lib/t/t.py --task-dir "$(git rev-parse --show-toplevel)" --list TODO | |
bug = !python ~/lib/t/t.py --task-dir "$(git rev-parse --show-toplevel)" --list BUGS | |
alias = "!sh -c '[ $# = 2 ] && git config --global alias.\"$1\" \"$2\" && exit 0 || [ $# = 1 ] && [ $1 = \"--list\" ] && git config --list | grep \"alias\\.\" | sed \"s/^alias\\.\\([^=]*\\)=\\(.*\\).*/\\1@@@@=>@@@@\\2/\" | sort | column -ts \"@@@@\" && exit 0 || echo \"usage: git alias <new alias> <original command>\\n git alias --list\" >&2 && exit 1' -" | |
ignore = "!sh -c '([ $# = 2 ] && ([ \"$1\" = \"--local\" ] && echo \"$2\" >> \"./$(git rev-parse --show-cdup)/.git/info/exclude\" || ([ \"$2\" = \"--local\" ] && echo \"$1\" >> \"./$(git rev-parse --show-cdup)/.git/info/exclude\"))) || ([ $# = 1 ] && (([ \"$1\" == \"--list\" ] && git ls-files -i --exclude-standard) || (([ ! -e .gitignore ] && touch .gitignore || echo \"$(cat .gitignore)\" > .gitignore) && echo \"$1\" >> .gitignore))) || echo \"usage: git ignore <file>\\n git ignore --local <file>\\n git ignore --list\" >&2 && exit 1' -" | |
lol = log --graph --decorate --pretty=oneline --abbrev-commit | |
lola = log --graph --decorate --pretty=oneline --abbrev-commit --all | |
cs = !git ls-staged | grep ".php" | xargs phpcs | |
peeps = !git log --pretty=format:%aN | sort | uniq -c | sort -rn | |
graph = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short | |
fshow = ! sh -c 'git show --pretty="format:" --name-only $1 | grep -v "^$" | uniq | sed -e "s#^#`git rev-parse --show-toplevel`/#"' - | |
vim = ! sh -c 'mvim `git fshow $1`' - | |
edit = ! sh -c '$EDITOR `git fshow $1`' - | |
killorphans = !sh -c "echo; git fetch -p; git branch -vv | grep ': gone]' | awk '{print $1}' | xargs git branch -Dv" | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment