mathieu/config
1
1
Fork 0
Code Issues Pull Requests Releases Activity

[git]use meld for gittool gitmerge

Browse Source
This commit is contained in:
Mathieu Maret 2015-06-30 15:48:10 +02:00
parent 18e4cb4344
commit 164b69dc0c
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
.gitconfig
View File

@ -20,11 +20,22 @@
lol = log --graph --decorate --pretty=oneline --abbrev-commit lol = log --graph --decorate --pretty=oneline --abbrev-commit
lola = log --graph --decorate --pretty=oneline --abbrev-commit --all lola = log --graph --decorate --pretty=oneline --abbrev-commit --all
ls = ls-files ls = ls-files
[diff "odf"] dt=difftool # to have diff with meld
# add to .git/info/attributes #[diff "odf"]
# *.ods diff=odf # textconv=odt2txt
# *.odt diff=odf #[diff "odt"]
# *.odp diff=odf # textconv=odt2txt
textconv=odt2txt [difftool "meld"]
[diff "odt"] path = /usr/bin/meld
textconv=odt2txt trustExitCode = false
[difftool]
prompt = false
[diff]
tool = meld
[mergetool "meld"]
path = /usr/bin/meld
trustExitCode = false
[mergetool]
keepBackup = false
[merge]
tool = meld