AverageMarcus/dotfiles
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added git diff pager

Browse Source
This commit is contained in:
Marcus Noble 2021-10-14 16:27:11 +01:00
parent 383e96efec
commit 9247ec3937
Signed by: AverageMarcus
GPG Key ID: B8F2DB8A7AEBAF78
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.gitconfig
View File

@ -8,8 +8,16 @@
[core] [core]
editor = /usr/bin/vim editor = /usr/bin/vim
excludesfile = ~/.gitignore excludesfile = ~/.gitignore
pager = git-split-diffs --color | less -RFX
[pager]
diff = delta
log = delta
reflog = delta
show = delta
[delta]
line-numbers = true
side-by-side = true
[push] [push]
default = simple default = simple

2
Makefile
View File

@ -36,6 +36,7 @@ pre-reqs: ## Install all required binaries.
which btm > /dev/null || cargo install bottom; \ which btm > /dev/null || cargo install bottom; \
which procs > /dev/null || brew install procs; \ which procs > /dev/null || brew install procs; \
which dog > /dev/null || brew install dog; \ which dog > /dev/null || brew install dog; \
which delta > /dev/null || brew install git-delta; \
which switcher > /dev/null || brew install danielfoehrkn/switch/switch; \ which switcher > /dev/null || brew install danielfoehrkn/switch/switch; \
brew install gpg gawk coreutils; \ brew install gpg gawk coreutils; \
git clone https://github.com/zsh-users/zsh-autosuggestions $${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions; \ git clone https://github.com/zsh-users/zsh-autosuggestions $${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions; \
@ -73,6 +74,7 @@ upgrade: ## Upgrade all required binaries.
which btm > /dev/null && cargo install bottom; \ which btm > /dev/null && cargo install bottom; \
which procs > /dev/null && brew upgrade procs; \ which procs > /dev/null && brew upgrade procs; \
which dog > /dev/null && brew upgrade dog; \ which dog > /dev/null && brew upgrade dog; \
which delta > /dev/null && brew upgrade git-delta; \
which switcher > /dev/null && brew upgrade switch; \ which switcher > /dev/null && brew upgrade switch; \
cd $${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions && git pull && cd -; \ cd $${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions && git pull && cd -; \
cd $${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-syntax-highlighting && git pull && cd -; \ cd $${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-syntax-highlighting && git pull && cd -; \