fernando/dotfiles
1
0
Fork 0
Code Issues 4 Pull requests Projects Releases Packages Wiki Activity

git: add side-by-side diffs

Browse source
This commit is contained in:
Fernando Schauenburg 2023-07-12 19:52:39 +02:00
parent 581c7d07e4
commit f323416c59
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bin/delta-wrapper
View file

@ -3,5 +3,7 @@
# - Use `git-delta` if installed. # - Use `git-delta` if installed.
# - Otherwise, fall back to `less`. # - Otherwise, fall back to `less`.
command -v delta >/dev/null 2>&1 && exec delta --true-color=always "$@" command -v delta >/dev/null 2>&1 && exec delta --true-color=always "$@"
exec less -F -X "$@"
# Consume option that would confuse `less`.
[ "$1" = "--side-by-side" ] && shift
exec less -F -X "$@"

2
config/git/config
View file

@ -4,6 +4,8 @@
ba = bv --all ba = bv --all
cm = commit --verbose cm = commit --verbose
co = checkout co = checkout
d = diff
ds = !GIT_PAGER=\"delta-wrapper --side-by-side\" git diff
l = log --graph --pretty=basic l = log --graph --pretty=basic
ln = log --graph --pretty=name ln = log --graph --pretty=name
ll = log --graph --decorate --stat ll = log --graph --decorate --stat