2015-09-15 17:15:20 +00:00
[core]
2016-04-21 18:49:05 +00:00
excludesfile = ~/.gitignore_global
2016-04-05 19:25:30 +00:00
[user]
email = tyrelsouza@gmail.com
name = Tyrel Souza
2016-04-21 18:49:05 +00:00
signingkey = 8A2DDEE2
2016-04-07 17:43:34 +00:00
[commit]
gpgsign = true
2016-04-07 18:04:31 +00:00
[color]
2016-04-21 18:49:05 +00:00
ui = auto # covers diff = true, status = auto, branch = auto
interactive = auto
2016-04-05 19:25:30 +00:00
[push]
2016-11-21 15:40:44 +00:00
default = current
2017-04-24 14:45:50 +00:00
[fetch]
prune = true
2016-04-07 17:32:17 +00:00
[format]
2016-04-07 17:43:34 +00:00
pretty = format:%C(auto)%h %C(green)%G? %C(red)%<(15,trunc)%aN %C(cyan)%<(15,trunc)%ar %C(white)%<(60,trunc)%s %C(auto)%d
2016-04-05 19:25:30 +00:00
[alias]
2017-05-26 14:20:57 +00:00
ab = "diff --name-only origin/master"
2017-05-08 18:04:27 +00:00
alias = "!git config -l | grep alias | cut -c 7-" # show all these aliases
bc = !git branch --merged master | grep -v master | xargs git branch -d # delete all merged branches
d = diff --color-words # prettier diffs
dsf = "!f() { [ \"$GIT_PREFIX\" != \"\" ] && cd "$GIT_PREFIX"; git diff --color $@ | diff-so-fancy | less --tabs=4 -RFX; }; f" # Diff so fancy!
files = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --numstat # Show files modified per commit
ll = log --stat --abbrev-commit # Way more information on git log
lb = log --stat --no-merges origin/master..
logtree= "log --graph --oneline --decorate --all" # show a tree with branches merging
2017-06-22 13:55:58 +00:00
ob = "!$EDITOR $(git diff --name-only origin/master | grep -v .tsv | grep -v .sql | grep -v static)"
od = "!$EDITOR $(git diff --name-only HEAD | grep -v .tsv | grep -v .sql | grep -v static)"
2016-04-21 18:49:05 +00:00
p = push
2016-11-21 15:40:44 +00:00
pr = !"pr() { git fetch origin pull/$1/head:pr-$1; git checkout pr-$1; }; pr"
2017-05-08 18:04:27 +00:00
recent = "!git for-each-ref --format=\"%(committerdate:relative) | %(refname)\" --sort=-committerdate refs/heads | sed '/master/d' | head -n 15" # get the most 10 recent branches worked on
2017-04-24 14:45:50 +00:00
scrum = log --since='1 day ago' --author='Tyrel Souza' --oneline
2017-05-08 18:04:27 +00:00
st = status # alias like `hg st`, because I like st, shorter is nice!
tabs = "!git diff --color | sed 's/\t/⌑/g'" # show tabs with ⌑ replacing tabs
v=describe --tags --match 'v*' # show the current version tag
2016-04-05 19:25:30 +00:00
[filter "lfs"]
2016-04-21 18:49:05 +00:00
clean = git-lfs clean %f
smudge = git-lfs smudge %f
required = true
2016-07-14 19:19:30 +00:00
[color "diff-highlight"]
oldNormal = red bold
oldHighlight = red bold 52
newNormal = green bold
newHighlight = green bold 22
2017-02-15 17:38:00 +00:00
[init]
templatedir = ~/.git_template
2017-05-11 21:16:45 +00:00
[difftool "sourcetree"]
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
path =
[mergetool "sourcetree"]
cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
trustExitCode = true