Skip to content

Instantly share code, notes, and snippets.

@noct
Last active December 21, 2015 19:23
Show Gist options
  • Save noct/5100987 to your computer and use it in GitHub Desktop.
Save noct/5100987 to your computer and use it in GitHub Desktop.
Git Config
[user]
name = unset
email = unset@url.com
[core]
autocrlf = false
preloadindex = true
[color]
ui = auto
[diff]
pager = less -x4
[merge]
ff = only
[push]
default = upstream
[alias]
alias = "!git config -l | grep alias | cut -c 7- | sed 's/=/\t/' | cut -c -72"
ap = add -p
au = add -u
bmv = branch -m
br = branch
brm = branch -D
cam = commit -am
cb = checkout -b
ccp = cherry-pick
cm = commit -m
co = checkout
ci = checkout -B
cp = cherry-pick -n
dc = diff -b --cached
di = diff -b
dlg = log -u -b
drop = reset --hard
ds = diff --stat
dump = format-patch --root HEAD --stdout
dw = diff -b --word-diff=color
ff = !git pull && git --no-pager log --pretty=short `git rev-parse --abbrev-ref HEAD`@{1}..
edit = commit --amend
fix = commit --amend --no-edit
fsync = reset --hard @{u}
ignore = update-index --assume-unchanged
unignore = update-index --no-assume-unchanged
lg = log --boundary --left-right --graph --format=format:'%C(bold black)%h%C(reset) %C(green)(%ar)%C(reset) %C(cyan)<%an>%C(reset) %C(yellow)%d%C(reset)%n %C(white)%s%C(reset)' --abbrev-commit
ls = remote show
pop = reset HEAD
rbi = rebase -i
save = stash save
sdi = "!f() { git di stash@{$1}^ stash@{$1}; }; f"
sds = "!f() { git ds stash@{$1}^ stash@{$1}; }; f"
sdw = "!f() { git dw stash@{$1}^ stash@{$1}; }; f"
sha1 = log -1 --format="%H"
sls = stash list
spop = stash pop
st = status -sb
stat = log --stat
trim = checkout -p --
up = remote update
ws = diff --check
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment