Permalink
Find file
Fetching contributors…
Cannot retrieve contributors at this time
154 lines (145 sloc) 5.38 KB
[color]
status = auto
branch = auto
diff = auto
interactive = auto
# ui = true
[core]
editor = vim
quotepath = false
pager = less -FRSX
excludesfile = ~/.gitignore
## see http://lostechies.com/keithdahlby/2011/04/06/windows-git-tip-hide-carriage-return-in-diff/
autocrlf = input
whitespace = trailing-space,space-before-tab
filemode = false
[github]
user = olifante
[alias]
s = status -sb
b = branch
ba = branch -a
br = branch -r
cm = commit -m
cam = commit -am
co = checkout
cp = cherry-pick
dc = diff --cached
d = diff
dns = diff --name-status
dt = difftool
mt = mergetool
ls = ls-files
last = cat-file commit HEAD
# Show files ignored by git:
ignored = ls-files --others --ignored --exclude-standard
ignored1 = ls-files --others --ignored --exclude-from=~/.gitignore
ignored2 = ls-files --others --ignored --exclude-from=.gitignore
ignored3 = ls-files --others --ignored --exclude-from=.git/info/exclude
ignored0 = clean -ndX
# safe removal of .git/config sections
remove-section = config -f .git/config --remove-section # e.g. git remove-section submodule.CoconutKit
# log aliases
lpatch = log -p
lns = log --name-status
lfuller = log --pretty=fuller --abbrev-commit
lfull = log --pretty=full --abbrev-commit
lmedium = log --pretty=medium --abbrev-commit
lshort = log --pretty=short --abbrev-commit
l1 = log --pretty=oneline --abbrev-commit
l = log --pretty=oneline --abbrev-commit --graph --decorate -20
la = log --pretty=oneline --abbrev-commit --graph --decorate -20 --all
lol = log --pretty=oneline --abbrev-commit --graph --decorate
lola = log --pretty=oneline --abbrev-commit --graph --decorate --all
lg = log --pretty=oneline --abbrev-commit -g # searches reflog
lrel = log --graph --pretty=format:'%h -%d %s (%cr) <%an>' --abbrev-commit --date=relative
# log search aliases
lgrep = log --pretty=oneline --abbrev-commit --grep
lstring = log --pretty=oneline --abbrev-commit -S
lregex = log --pretty=oneline --abbrev-commit -G
lggrep = log --pretty=oneline --abbrev-commit -g --grep # searches reflog
lgstring = log --pretty=oneline --abbrev-commit -g -S # searches reflog
lgregex = log --pretty=oneline --abbrev-commit -g -G # searches reflog
add-unmerged = \
"!f() { git ls-files --unmerged | cut -f2 | sort -u ; }; git add `f`"
# "!f() { git status --porcelain | grep '^[ADU][ADU]' | cut -d' ' -f2 }; git add `f`"
edit-unmerged = \
"!f() { git ls-files --unmerged | cut -f2 | sort -u }; mate `f`"
switch = !legit switch \"$@\"
branches = !legit branches
sprout = !legit sprout \"$@\"
unpublish = !legit unpublish \"$@\"
harvest = !legit harvest \"$@\"
sync = !legit sync \"$@\"
publish = !legit publish \"$@\"
graft = !legit graft \"$@\"
# "!f() { git status --porcelain | grep '^UU' | cut -d' ' -f2 }; mate `f`"
[push]
default = tracking
[branch]
autosetuprebase = always
autosetupmerge = true
[branch "master"]
rebase = true
[diff]
tool = p4diff
mnemonicprefix = true
[difftool "echo"]
cmd = "echo.sh \"$LOCAL\" \"$REMOTE\""
[difftool "filemerge"]
cmd = "opendiff \"$LOCAL\" \"$REMOTE\""
[difftool "diffmerge"]
cmd = "diffmerge.sh \"$LOCAL\" \"$REMOTE\""
[difftool "araxis"]
cmd = $HOME/bin/Utilities/araxisgitdiff
[difftool "p4diff"]
#cmd = "/Applications/p4merge.app/Contents/MacOS/p4merge \"$LOCAL\" \"$PWD/$REMOTE\""
cmd = "/Applications/p4merge.app/Contents/Resources/launchp4merge \"$LOCAL\" \"$PWD/$REMOTE\""
[diff "localizablestrings"]
## add this line to your .gitattributes or .git/info/attributes file
## to allow git to diff UTF-16 files such as Localizable.strings
## *.strings diff=localizablestrings
textconv = "iconv -f utf-16 -t utf-8"
[merge]
tool = custom_p4merge
commit = no
ff = no
stat = true
[mergetool]
keepBackup = false
[mergetool "diffmerge"]
cmd = "diffmerge --merge --result=\"$MERGED\" \"$LOCAL\" \"$(if test -f \"$BASE\"; then echo \"$BASE\"; else echo \"$LOCAL\"; fi)\" \"$REMOTE\""
trustExitCode = true
[mergetool "araxis"]
cmd = "$HOME/bin/Utilities/araxisgitmerge \"$PWD/$REMOTE\" \"$PWD/$BASE\" \"$PWD/$LOCAL\" \"$PWD/$MERGED\""
trustExitCode = false
[mergetool "ecmerge"]
path = /Applications/ECMerge.app/Contents/MacOS/guimerge
[mergetool "custom_p4merge"]
cmd = "/Applications/p4merge.app/Contents/Resources/launchp4merge \"$PWD/$BASE\" \"$PWD/$LOCAL\" \"$PWD/$REMOTE\" \"$PWD/$MERGED\""
keepTemporaries = false
trustExitCode = false
[user]
name = Tiago Henriques
email = trinosauro@gmail.com
#email = tiago.henriques@gmail.com
[log]
date = iso
[filter "media"]
clean = git media clean %f
smudge = git media smudge %f
required = true
[rerere]
enabled = true
[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
[url "https://"]
insteadOf = git://
[rebase]
autostash = true
[url "https://"]
insteadOf = git://