config/.gitconfig
2016-11-08 11:39:36 +01:00

87 lines
2.2 KiB
INI

[user]
name = Mathieu Maret
email = mathieu.maret@gmail.com
[color]
ui = auto
diff = auto
status = auto
branch = auto
[pack]
threads = 0
[alias]
st = status
ci = commit
co = checkout
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
lolp = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
ls = ls-files
dt = difftool # to have diff with meld
mylog = log --committer=\"$(git config user.name)\"
please = push --force-with-lease
# Remove last commit but keep changes
undo = reset --soft HEAD^
revertpart = reset -p HEAD^
diffword = diff --color-words=.
save = stash save -u
#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' -
[branch]
#New branch track remote
#autoSetupMerge = always
[diff "odf"]
textconv=odt2txt
[diff "odt"]
textconv=odt2txt
[difftool "meld"]
path = /usr/bin/meld
trustExitCode = false
[difftool]
prompt = false
[diff]
tool = meld
compactionHeuristic = true
[mergetool "meld"]
path = /usr/bin/meld
trustExitCode = false
[mergetool]
# do not keep .ori file after a merge
keepBackup = false
[merge]
tool = meld
# tool = vimdiff
# conflictstyle = diff3
[push]
default = simple
[credential]
helper = cache --timeout=3600
[sendemail]
from = Mathieu Maret <mathieu.maret@gmail.com>
smtpserver = smtp.gmail.com
smtpuser = mathieu.maret
smtpencryption = tls
smtpserverport = 587
# smtppass = PASS
[web]
browser = firefox
[rerere]
enabled = true
[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