Skip to content

Instantly share code, notes, and snippets.

@jrusbatch
Created September 20, 2018 15:54
Show Gist options
  • Save jrusbatch/873506636e9534cd5da9765e17a5e80e to your computer and use it in GitHub Desktop.
Save jrusbatch/873506636e9534cd5da9765e17a5e80e to your computer and use it in GitHub Desktop.
[alias]
amend = commit -a --amend
branches = branch -avv
bclean = "!f() { git branch --merged ${1-develop} | grep -v \\* | grep -v master$ | grep -v ${1-develop}$ | xargs -r git branch -d; }; f"
c = clone --recursive
ca = !git add -A && git commit -av
co = checkout
d = diff --patch-with-stat
fetch-pr = "!f() { git fetch -fu $1 refs/pull/$2/head:pull-$2; }; f"
go = checkout -B
l = log -n 20 --abbrev-commit --pretty=format:'%Cred%h%Creset %C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset'
puff = pull --ff-only --recurse-submodules --prune
remotes = remote -v
s = status -s
sh = show --abbrev-commit --pretty=format:'%Cred%h%Creset %C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset'
tags = tag -l
plat = "!f() { B=$(git branch --list \"*-PLAT-$1\");C=$(grep -c . <<<\"$B\"); if (( $C == 1 )); then git checkout $B; else echo \"$C branches found for PLAT-$1\"; fi; }; f"
[core]
editor = code -n --wait
excludesfile = ~/.gitignore
attributesfile = ~/.gitattributes
autocrlf = true
commentChar = :
[color]
ui = auto
[color "branch"]
current = yellow reverse
local = yellow
remote = green
[color "diff"]
meta = yellow bold
frag = magenta bold
old = red bold
new = green bold
[color "status"]
added = yellow
changed = green
untracked = cyan
[gpg]
program = C:/Program Files (x86)/GnuPG/bin/gpg.exe
[merge]
log = true
tool = kdiff3
[url "git@github.com:"]
insteadOf = gh:
pushInsteadOf = github:
pushInsteadOf = git://github.com/
[url "git://github.com/"]
insteadOf = github:
[url "git@gist.github.com:"]
insteadOf = gst:
pushInsteadOf = gist:
pushInsteadOf = git://gist.github.com/
[url "git://gist.github.com/"]
insteadOf = gist:
[push]
default = simple
[diff]
algorithm = patience
tool = kdiff3
guitool = kdiff3
[mergetool]
keepBackup = false
[filter "lfs"]
clean = git lfs clean %f
smudge = git lfs smudge %f
required = true
[mergetool "kdiff3"]
path = C:/Program Files (x86)/KDiff3/kdiff3.exe
[difftool "kdiff3"]
path = C:/Program Files (x86)/KDiff3/kdiff3.exe
[rebase]
autostash = true
[i18n]
filesEncoding = utf-8
[commit]
gpgsign = false
[rerere]
enabled = true
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment