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
|
|
|
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
|
2015-02-26 15:21:14 +01:00
|
|
|
lolp = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
|
2012-05-30 14:26:03 +02:00
|
|
|
ls = ls-files
|
2016-10-18 11:06:09 +02:00
|
|
|
dt = difftool # to have diff with meld
|
2014-07-30 14:08:20 +02:00
|
|
|
mylog = log --committer=\"$(git config user.name)\"
|
2016-10-18 11:06:09 +02:00
|
|
|
please = push --force-with-lease
|
2014-09-17 11:53:44 +02:00
|
|
|
# Remove last commit but keep changes
|
2016-10-18 11:06:09 +02:00
|
|
|
undo = reset --soft HEAD^
|
2014-09-17 11:53:44 +02:00
|
|
|
revertpart = reset -p HEAD^
|
|
|
|
|
diffword = diff --color-words=.
|
2016-10-18 11:06:09 +02:00
|
|
|
save = stash save -u
|
2016-11-08 11:39:36 +01:00
|
|
|
#rebase last N commits
|
|
|
|
|
rb = "!f() { git rebase -i HEAD~$1; }; f"
|
|
|
|
|
#rebase since branching on branch N
|
|
|
|
|
rbi = !sh -c \"git rebase -i `git merge-base $1 HEAD`\" -
|
|
|
|
|
cleanbr = remote prune origin
|
|
|
|
|
cleanbrshow = remote prune origin --dry-run
|
|
|
|
|
contains = !sh -c 'git branch -a --contains $1' -
|
2016-10-18 11:06:09 +02:00
|
|
|
|
|
|
|
|
[branch]
|
|
|
|
|
#New branch track remote
|
|
|
|
|
#autoSetupMerge = always
|
|
|
|
|
[diff "odf"]
|
|
|
|
|
textconv=odt2txt
|
|
|
|
|
[diff "odt"]
|
|
|
|
|
textconv=odt2txt
|
|
|
|
|
|
2015-06-30 15:48:10 +02:00
|
|
|
[difftool "meld"]
|
|
|
|
|
path = /usr/bin/meld
|
|
|
|
|
trustExitCode = false
|
|
|
|
|
[difftool]
|
|
|
|
|
prompt = false
|
|
|
|
|
[diff]
|
|
|
|
|
tool = meld
|
2016-10-07 10:31:59 +02:00
|
|
|
compactionHeuristic = true
|
2015-06-30 15:48:10 +02:00
|
|
|
[mergetool "meld"]
|
|
|
|
|
path = /usr/bin/meld
|
|
|
|
|
trustExitCode = false
|
|
|
|
|
[mergetool]
|
2016-10-18 11:06:09 +02:00
|
|
|
# do not keep .ori file after a merge
|
2015-06-30 15:48:10 +02:00
|
|
|
keepBackup = false
|
|
|
|
|
[merge]
|
|
|
|
|
tool = meld
|
2016-10-18 11:06:09 +02:00
|
|
|
# tool = vimdiff
|
|
|
|
|
# conflictstyle = diff3
|
2013-02-25 17:16:30 +01:00
|
|
|
[push]
|
|
|
|
|
default = simple
|
2013-12-13 11:37:40 +01:00
|
|
|
[credential]
|
|
|
|
|
helper = cache --timeout=3600
|
2014-03-07 11:22:09 +01:00
|
|
|
[sendemail]
|
|
|
|
|
from = Mathieu Maret <mathieu.maret@gmail.com>
|
|
|
|
|
smtpserver = smtp.gmail.com
|
|
|
|
|
smtpuser = mathieu.maret
|
|
|
|
|
smtpencryption = tls
|
|
|
|
|
smtpserverport = 587
|
|
|
|
|
# smtppass = PASS
|
2014-09-03 11:33:11 +02:00
|
|
|
[web]
|
|
|
|
|
browser = firefox
|
2015-02-26 15:21:14 +01:00
|
|
|
|
|
|
|
|
[rerere]
|
|
|
|
|
enabled = true
|
2016-10-07 10:31:59 +02:00
|
|
|
[pager]
|
|
|
|
|
log = /usr/share/git/diff-highlight/diff-highlight | less
|
|
|
|
|
show = /usr/share/git/diff-highlight/diff-highlight | less
|
|
|
|
|
diff = /usr/share/git/diff-highlight/diff-highlight | less
|
|
|
|
|
[interactive]
|
|
|
|
|
diffFilter = /usr/share/git/diff-highlight/diff-highlight
|
