-
-
Save adrienjoly/d2f508b76f254058cd92 to your computer and use it in GitHub Desktop.
This file contains hidden or 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
[user] | |
name = "Jérémy Giuseppi" | |
email = [email protected] | |
[credential] | |
helper = cache | |
[color] | |
branch = auto | |
diff = auto | |
interactive = auto | |
status = auto | |
[alias] | |
amend = commit --amend | |
ci = commit | |
cim = commit -m | |
cima = commit -am | |
co = checkout | |
st = status -sb | |
br = branch | |
cp = cherry-pick -x | |
b = branch -v | |
r = remote -v | |
t = tag -l | |
d = diff | |
nb = checkout -b | |
unstage = reset HEAD | |
uncommit = reset --soft HEAD^ | |
lg = log --graph --pretty=tformat:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%an %cr)%Creset' | |
[push] | |
default = simple | |
# Porteneuve | |
# https://gist.github.com/tdd/470582 | |
[color] | |
ui = auto | |
[core] | |
pager = cat | |
# Sublime text on windows | |
# editor = "C:/Program Files/Sublime Text 2/sublime_text.exe -w" | |
editor = "subl -n -w" | |
whitespace = -trailing-space | |
excludesfile = /Users/jeremy/.gitignore_global | |
autocrlf = false | |
[diff] | |
mnemonicPrefix = true | |
wordRegex = . | |
[fetch] | |
recurseSubmodules = on-demand | |
[grep] | |
extendedRegexp = true | |
[log] | |
abbrevCommit = true | |
[merge] | |
conflictStyle = diff3 | |
[mergetool] | |
keepBackup = false | |
keepTemporaries = false | |
prompt = false | |
[pull] | |
rebase = preserve | |
[push] | |
# default = upstream | |
[rerere] | |
# If, like me, you like rerere, decomment these | |
# autoupdate = true | |
# enabled = true | |
[status] | |
submoduleSummary = true | |
[filter "media"] | |
clean = git-media-clean %f | |
smudge = git-media-smudge %f | |
[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 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment