config/.gitconfig

70 lines
1.6 KiB
INI
Raw Normal View History

2009-11-20 11:57:39 +01:00
[user]
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
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]
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
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
2014-07-30 14:08:20 +02:00
dt =difftool # to have diff with meld
mylog = log --committer=\"$(git config user.name)\"
2015-06-30 15:48:10 +02:00
#[diff "odf"]
# textconv=odt2txt
#[diff "odt"]
# textconv=odt2txt
2014-09-17 11:53:44 +02:00
# Remove last commit but keep changes
undo = git reset --soft HEAD^
# last commit
lasts = log --pretty=oneline --abbrev-commit --graph --decorate
# last commit from last pull
lastpull = !git lasts HEAD --stat --no-merges
revertpart = reset -p HEAD^
diffword = diff --color-words=.
save = stash save -u
2015-06-30 15:48:10 +02:00
[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
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