60 lines
1.9 KiB
Text
60 lines
1.9 KiB
Text
|
[include]
|
||
|
|
path = .gituser # Store personal data in external file
|
||
|
|
[alias]
|
||
|
|
b = branch
|
||
|
|
c = checkout
|
||
|
|
d = diff
|
||
|
|
co = commit
|
||
|
|
l = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(auto)%d%C(reset)'
|
||
|
|
ll = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset) %C(bold cyan)(committed: %cD)%C(reset) %C(auto)%d%C(reset)%n'' %C(white)%s%C(reset)%n'' %C(dim white)- %an <%ae> %C(reset) %C(dim white)(committer: %cn <%ce>)%C(reset)'
|
||
|
|
ls = ls-files
|
||
|
|
pl = pull
|
||
|
|
ps = push
|
||
|
|
r = rebase
|
||
|
|
s = status
|
||
|
|
sa = stash apply
|
||
|
|
sc = stash clear
|
||
|
|
st = stash
|
||
|
|
w = whatchanged -p
|
||
|
|
wo = whatchanged -p origin..
|
||
|
|
ign = ls-files -o -i --exclude-standard
|
||
|
|
track = branch --set-upstream
|
||
|
|
undo = reset --soft HEAD^
|
||
|
|
unstage = reset HEAD --
|
||
|
|
[color]
|
||
|
|
branch = auto
|
||
|
|
diff = auto
|
||
|
|
status = auto
|
||
|
|
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
|
||
|
|
[push]
|
||
|
|
default = simple
|
||
|
|
autoSetupRemote = true
|
||
|
|
[pull]
|
||
|
|
rebase = true
|
||
|
|
[core]
|
||
|
|
editor = nvim
|
||
|
|
excludesfile = /Users/felix.delattre/.gitignore_global
|
||
|
|
|
||
|
|
[user]
|
||
|
|
name = Felix Delattre
|
||
|
|
email = felix.delattre@up42.com
|
||
|
|
[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
|