2009-11-20 11:57:39 +01:00
|
|
|
[user]
|
2010-11-10 15:27:39 +01:00
|
|
|
name = Mathieu Maret
|
2011-04-18 16:36:24 +02:00
|
|
|
email = mathieu.maret@gmail.com
|
2009-11-20 11:57:39 +01:00
|
|
|
[color]
|
|
|
|
|
ui = auto
|
|
|
|
|
diff = auto
|
2010-11-10 15:27:39 +01:00
|
|
|
status = auto
|
2009-11-20 11:57:39 +01:00
|
|
|
branch = auto
|
2010-09-15 18:09:24 +02:00
|
|
|
[pack]
|
|
|
|
|
threads = 0
|
2009-11-20 11:57:39 +01:00
|
|
|
[alias]
|
2010-11-10 15:27:39 +01:00
|
|
|
lg = log -M --decorate --graph
|
|
|
|
|
st = status
|
|
|
|
|
ci = commit
|
|
|
|
|
co = checkout
|
2012-05-30 14:26:03 +02:00
|
|
|
br = branch
|
|
|
|
|
df = diff
|
|
|
|
|
dc = diff --cached
|
|
|
|
|
lg = log -p
|
|
|
|
|
lol = log --graph --decorate --pretty=oneline --abbrev-commit
|
|
|
|
|
lola = log --graph --decorate --pretty=oneline --abbrev-commit --all
|
|
|
|
|
ls = ls-files
|
2015-06-30 15:48:10 +02:00
|
|
|
dt=difftool # to have diff with meld
|
|
|
|
|
#[diff "odf"]
|
|
|
|
|
# textconv=odt2txt
|
|
|
|
|
#[diff "odt"]
|
|
|
|
|
# textconv=odt2txt
|
|
|
|
|
[difftool "meld"]
|
|
|
|
|
path = /usr/bin/meld
|
|
|
|
|
trustExitCode = false
|
|
|
|
|
[difftool]
|
|
|
|
|
prompt = false
|
|
|
|
|
[diff]
|
|
|
|
|
tool = meld
|
|
|
|
|
[mergetool "meld"]
|
|
|
|
|
path = /usr/bin/meld
|
|
|
|
|
trustExitCode = false
|
|
|
|
|
[mergetool]
|
|
|
|
|
keepBackup = false
|
|
|
|
|
[merge]
|
|
|
|
|
tool = meld
|
