Last active
May 31, 2018 11:49
-
-
Save ahpex/2947fda35d9338f68a54c65fc0db1807 to your computer and use it in GitHub Desktop.
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
[core] | |
editor = /usr/bin/vim | |
excludesfile = /Users/np/.gitignore_global | |
pager=less -x4 | |
[user] | |
email = name@company.com | |
name = Firstname Lastname | |
[fetch] | |
prune = true | |
[include] | |
path = ~/.git-sendemail | |
[color] | |
branch = auto | |
diff = auto | |
status = auto | |
[color "branch"] | |
current = red reverse | |
local = blue | |
remote = green | |
[color "diff"] | |
meta = yellow | |
frag = magenta | |
old = red bold | |
new = green | |
plain = white | |
[color "status"] | |
added = yellow | |
changed = green | |
untracked = cyan | |
[push] | |
default = current | |
[pull] | |
default = current | |
[diff] | |
mnemonicprefix = true | |
[branch] | |
autosetuprebase = always | |
[apply] | |
whitespace = nowarn | |
[alias] | |
st = status -s | |
cl = clone | |
ci = commit | |
co = checkout | |
br = branch | |
r = reset | |
cp = cherry-pick | |
gr = grep -Ii | |
diff = diff --word-diff | |
branch = branch -ra | |
grep = grep -Ii | |
bra = branch -ra | |
ai = add --interactive | |
# grep on filename | |
f = "!git ls-files | grep -i" | |
cm = commit -m | |
cma = commit -a -m | |
ca = commit --amend | |
amend = commit --amend | |
caa = commit -a --amend -C HEAD | |
ls = log --pretty=format:"%C(green)%h\\ %C(yellow)[%ad]%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=relative | |
ll = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --numstat | |
lc = "!f() { git ll "$1"^.."$1"; }; f" | |
lnc = log --pretty=format:"%h\\ %s\\ [%cn]" | |
fl = log -u | |
filelog = log -u | |
d = diff --word-diff | |
dc = diff --cached | |
# diff last commit | |
dlc = diff --cached HEAD^ | |
dr = "!f() { git diff -w "$1"^.."$1"; }; f" | |
diffr = "!f() { git diff "$1"^.."$1"; }; f" | |
r1 = reset HEAD^ | |
r2 = reset HEAD^^ | |
rh = reset --hard | |
rh1 = reset HEAD^ --hard | |
rh2 = reset HEAD^^ --hard | |
svnr = svn rebase | |
svnd = svn dcommit | |
svnl = svn log --oneline --show-commit | |
sl = stash list | |
sa = stash apply | |
ss = stash save | |
assume = update-index --assume-unchanged | |
unassume = update-index --no-assume-unchanged | |
# show assumed files | |
assumed = "!git ls-files -v | grep ^h | cut -c 3-" | |
# unassume all the assumed files | |
unassumeall = "!git assumed | xargs git update-index --no-assume-unchanged" | |
assumeall = "!git status -s | awk {'print $2'} | xargs git assume" | |
# add | |
sba = "!f() { git subtree add --prefix $2 $1 master --squash; }; f" | |
# update/pull | |
sbu = "!f() { git subtree pull --prefix $2 $1 master --squash; }; f" | |
# last tag created | |
lasttag = describe --tags --abbrev=0 | |
lt = describe --tags --abbrev=0 | |
# conflict/merges | |
ours = "!f() { git co --ours $@ && git add $@; }; f" | |
theirs = "!f() { git co --theirs $@ && git add $@; }; f" | |
#list remotes | |
rem="!git config -l | grep remote.*url | tail -n +2" | |
#apply patch from other local repo | |
lap = "!f() { git --git-dir=$1 format-patch -k -1 --stdout $2 | git am -3 -k; }; f" | |
#open markdown files edited in last commit | |
last = "!gvim $(git show HEAD --format="" --name-only | grep -e .*md$ | xargs)" | |
#open just created markdown in working directory | |
newmd = "!gvim $(git status -s | awk {'print $2'})" | |
# initial empty commit | |
empty = "!git commit -am\"[empty] Initial commit\" --allow-empty" | |
# list all aliases | |
la = "!git config -l | grep alias | cut -c 7-" | |
# grep from root folder | |
gra = "!f() { A=$(pwd) && TOPLEVEL=$(git rev-parse --show-toplevel) && cd $TOPLEVEL && git grep --full-name -In $1 | xargs -I{} echo $TOPLEVEL/{} && cd $A; }; f" | |
#rename branch tree to done- | |
done = "!f() { git branch | grep "$1" | cut -c 3- | grep -v done | xargs -I{} git branch -m {} done-{}; }; f" | |
#add bitbucket remote | |
ra = "!f() { git remote add $1 https://bitbucket.org/$2.git; }; f" | |
wl = worktree list | |
# undo from here http://megakemp.com/2016/08/25/git-undo/ | |
undo = "!f() { git reset --hard $(git rev-parse --abbrev-ref HEAD)@{${1-1}}; }; f" | |
[rerere] | |
enabled = false | |
[rebase] | |
autosquash = true | |
[filter "lfs"] | |
clean = git-lfs clean %f | |
smudge = git-lfs smudge %f | |
required = true |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment