Marty/dotfiles
1
0
Fork 0
Code Issues 3 Pull requests Projects Releases Wiki Activity

[git] Clean up config formatting, color diffs

Browse source 
Made git aliasing exit if no git executable is found (which should not
happen, but still) instead of putting all aliases into the conditional.

Added unified colors to git diffs.

Cleaned up formatting of the files.
This commit is contained in:
Marty Oehme 2020-05-28 13:29:49 +02:00
parent 7895b1c052
commit 17f8ca062d
No known key found for this signature in database
GPG key ID: 0CCB0526EFB9611A
2 changed files with 96 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
git/.config/git/config
View file

@ -22,6 +22,18 @@
rebase = true # always rebase on pulling, obviates merge commits
[diff]
colorMoved = zebra # also color stuff that has simply been moved, in a classy zebra-color
[color.diff]
meta = "9"
frag = "magenta bold"
commit = "yellow bold"
old = "red bold"
new = "green bold"
whitespace = "red reverse"
[color.diff-highlight]
oldNormal = "red bold"
oldHighlight = "red bold 52"
newNormal = "green bold"
newHighlight = "green bold 22"
[rebase]
autostash = true
autoSquash = true

90
git/.config/sh/alias.d/git.sh
View file

@ -1,56 +1,61 @@
#!/usr/bin/env sh
if ! exist git; then
return 1
fi
# git alias
if exist git; then
alias g='git'
alias ga='git add'
alias gaa='git add --all'
alias gai='git add -i'
alias gb='git branch'
alias gbd='git branch -d'
alias g='git'
alias gc='git commit -v'
alias gc!='git commit -v --amend'
alias gcn!='git commit -v --no-edit --amend'
alias ga='git add'
alias gaa='git add --all'
alias gai='git add -i'
alias gb='git branch'
alias gbd='git branch -d'
alias gcm='git checkout master'
alias gcd='git checkout develop'
alias gcb='git checkout -b'
alias gco='git checkout'
alias gc='git commit -v'
alias gc!='git commit -v --amend'
alias gcn!='git commit -v --no-edit --amend'
alias gd='git diff'
alias gds='git diff --staged'
alias gcm='git checkout master'
alias gcd='git checkout develop'
alias gcb='git checkout -b'
alias gco='git checkout'
alias gi='git ignore'
alias gd='git diff'
alias gds='git diff --staged'
alias glog='git log --stat'
alias glg='git log --oneline --decorate --graph'
alias glga='git log --oneline --decorate --graph --remotes --all'
alias glgp='git log --stat -p'
alias gi='git ignore'
alias gf='git fetch'
alias gl='git pull'
alias glog='git log --stat'
alias glg='git log --oneline --decorate --graph'
alias glga='git log --oneline --decorate --graph --remotes --all'
alias glgp='git log --stat -p'
alias gpn='git push --dry-run'
alias gp='git push'
alias gpf!='git push --force'
alias gpm='git pushmerge'
alias gf='git fetch'
alias gl='git pull'
alias grv='git remote -v'
alias gpn='git push --dry-run'
alias gp='git push'
alias gpf!='git push --force'
alias gpm='git pushmerge'
alias grs='git restore --staged'
alias grs!='git restore'
alias grv='git remote -v'
alias grbi='git rebase -i'
alias grbc='git rebase --continue'
alias grs='git restore --staged'
alias grs!='git restore'
alias gst='git status'
alias grbi='git rebase -i'
alias grbc='git rebase --continue'
alias grbm='git rebase master'
# if git is at least version 2.13, we can use git stash push
# in shells other than zsh, simply fall back to save
case "$(ps -cp "$$" -o command="")" in
*zsh*)
alias gst='git status'
# if git is at least version 2.13, we can use git stash push
# in shells other than zsh, simply fall back to save
case "$(ps -cp "$$" -o command="")" in
*zsh*)
autoload -Uz is-at-least
if is-at-least 2.13 "$(git --version 2>/dev/null | awk '{print $3}')"; then
alias gsta='git stash push'
@ -58,8 +63,9 @@ if exist git; then
alias gsta='git stash save'
fi
;;
*) alias gsta='git stash save' ;;
esac
alias gstp='git stash pop'
alias gstl='git stash list'
fi
*) alias gsta='git stash save' ;;
esac
alias gstp='git stash pop'
alias gstl='git stash list'
alias gstL='git stash list --stat'