config/git
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

meld

Browse Source
This commit is contained in:
Andrei Astafev 2019-05-28 22:09:38 +03:00
parent 2c6a4e5d94
commit 166de8d5ed
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
config
View File

@ -1,16 +1,25 @@
[user] [user]
name = Andrey Astafyev name = Andrey Astafyev
email = dev@246060.ru email = dev@246060.ru
[core] [core]
editor = vim editor = vim
pager = less -R pager = less -R
whitespace=fix,trailing-space,cr-at-eol whitespace=fix,trailing-space,cr-at-eol
autocrlf = input autocrlf = input
safecrlf = true safecrlf = true
[merge] [merge]
tool = meld tool = meld
[diff]
tool = meld
[difftool]
prompt = false
[difftool "meld"]
cmd = meld "$LOCAL" "$REMOTE"
[alias] [alias]
# Base commands # Base commands