better font settings for cygwin, kdiff3 works with git difftool now
This commit is contained in:
parent
a84400ba7c
commit
c0fc4e6edd
4 changed files with 27 additions and 4 deletions
|
@ -1,5 +1,5 @@
|
|||
[difftool "kdiff3"]
|
||||
path = kdiff3
|
||||
path = kdiff3.sh
|
||||
trustExitCode = false
|
||||
[difftool]
|
||||
prompt = false
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
BoldAsFont=no
|
||||
BoldAsFont=yes
|
||||
Term=xterm-256color
|
||||
Columns=225
|
||||
Rows=70
|
||||
|
@ -23,6 +23,7 @@ White=238,232,213
|
|||
BoldWhite=253,246,227
|
||||
Font=Inconsolata for Powerline
|
||||
FontHeight=12
|
||||
FontSmoothing=full
|
||||
Locale=C
|
||||
FontSmoothing=partial
|
||||
Locale=en_GB
|
||||
Charset=UTF-8
|
||||
FontIsBold=yes
|
||||
|
|
19
cygwin/cygwinify.sh
Executable file
19
cygwin/cygwinify.sh
Executable file
|
@ -0,0 +1,19 @@
|
|||
#!/usr/bin/bash
|
||||
RESULT=""
|
||||
for arg
|
||||
do
|
||||
if [[ "" != "$arg" ]] && [[ -e $arg ]];
|
||||
then
|
||||
OUT=`cygpath -wa $arg`
|
||||
else
|
||||
if [[ $arg == -* ]];
|
||||
then
|
||||
OUT=$arg
|
||||
else
|
||||
OUT="'$arg'"
|
||||
fi
|
||||
fi
|
||||
RESULT=$RESULT$OUT" "
|
||||
done
|
||||
echo "$RESULT"
|
||||
|
3
cygwin/kdiff3.sh
Executable file
3
cygwin/kdiff3.sh
Executable file
|
@ -0,0 +1,3 @@
|
|||
#!/usr/bin/bash
|
||||
kdiff3 `~/tools/cygwinify.sh "$@"`
|
||||
|
Loading…
Reference in a new issue