frebib/dotfiles
1
0
Fork 0
mirror of https://github.com/frebib/dotfiles.git synced 2024-06-14 12:57:23 +00:00
Code Issues Releases Wiki Activity

git/config: improve git-diff colours with diff-so-fancy

Browse Source
This commit is contained in:
Joe Groocock
2018-03-29 15:57:51 +01:00
parent f288397231
commit 593f39fff3
4 changed files with 32 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
aliases
View File

@ -92,7 +92,6 @@ alias -s gz="tar tf"
alias -s jar="java -jar"
alias -s git="git clone --recursive"
# Git Aliases
alias g=git
alias gignore='$EDITOR .gitignore'
@ -102,7 +101,7 @@ alias gcl="git clone --recursive"
alias gco="git checkout"
alias gcom="git checkout master"
alias ga="git add"
alias gap="git -c interactive.diffFilter=\"git diff --color-words\" add -p"
alias gap="git add -p"
alias gaa="ga -A"
alias grm="git rm"
alias gc="git commit"
@ -130,14 +129,13 @@ alias glp="gl && gp"
gd() {
local commit=$1
if [ -z "$commit" ] || [ ${commit:0:1} != '@' ]; then
git diff --color-words $@
return
git diff $@
else
git diff --color-words "@~${commit:1}^!"
git diff "@~${commit:1}^!"
fi
}
alias gds="git diff --staged --color-words"
alias gsh="git show --color-words"
alias gds="git diff --staged"
alias gsh="git show"
alias glg="git log --stat --color"
alias glog="git log --oneline --decorate --color --graph"