Add colordiff, alias + config

This commit is contained in:
Tobias Schmidl 2013-10-24 10:10:22 +02:00
parent 031ad6a3f1
commit 00b8af1715
2 changed files with 30 additions and 0 deletions

View file

@ -29,5 +29,6 @@ alias alert='notify-send --urgency=low -i "$([ $? -eq 0 ] && echo terminal || ec
alias git-patch='git diff --minimal --find-renames --find-copies --relative ./ > ../$(basename `pwd`).patch && git co -- ./' alias git-patch='git diff --minimal --find-renames --find-copies --relative ./ > ../$(basename `pwd`).patch && git co -- ./'
alias ssh-add-all='for a in .ssh/id_*; do ssh-add $a; done;' alias ssh-add-all='for a in .ssh/id_*; do ssh-add $a; done;'
alias screen='screen -RU' alias screen='screen -RU'
alias cdiff="colordiff"
xmlformat () { xmllint --format "$1" | unexpand -t 2 --first-only; } xmlformat () { xmllint --format "$1" | unexpand -t 2 --first-only; }
alias jjar='java -jar' alias jjar='java -jar'

29
colordiffrc Normal file
View file

@ -0,0 +1,29 @@
# Example colordiffrc file for dark backgrounds
#
# Set banner=no to suppress authorship info at top of
# colordiff output
banner=no
# By default, when colordiff output is being redirected
# to a file, it detects this and does not colour-highlight
# To make the patch file *include* colours, change the option
# below to 'yes'
color_patches=no
# Sometimes it can be useful to specify which diff command to
# use: that can be specified here
diff_cmd=diff
#
# available colours are: white, yellow, green, blue,
# cyan, red, magenta, black,
# darkwhite, darkyellow, darkgreen,
# darkblue, darkcyan, darkred,
# darkmagenta, darkblack
#
# Can also specify 'none', 'normal' or 'off' which are all
# aliases for the same thing, namely "don't colour highlight
# this, use the default output colour"
#
plain=off
newtext=green
oldtext=red
diffstuff=cyan
cvsstuff=white