Marty Oehme
df0cf3d540
For git versions that support it, the aliases will use the newer `switch` instruction instead of `checkout` for its use cases. Creating a new branch through `gcb` is for example done by `git switch -c` instead of the older `git checkout -b`. Additionally streamlined git version checking to be a little faster and to unify its approach on posix sh, bash and zsh instead of utilizing individual checking functions.
81 lines
1.8 KiB
Bash
81 lines
1.8 KiB
Bash
#!/usr/bin/env sh
|
|
|
|
if ! exist git; then
|
|
return 1
|
|
fi
|
|
|
|
# print git version output and get raw version number by stripping prefix
|
|
git_version=$(git --version 2>/dev/null)
|
|
git_version="${git_version##git version }"
|
|
|
|
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 gc='git commit -v'
|
|
alias gc!='git commit -v --amend'
|
|
alias gcn!='git commit -v --no-edit --amend'
|
|
|
|
if version_at_least 2.23 "$git_version"; then
|
|
alias gcm='git switch master 2>/dev/null || git switch main'
|
|
alias gcd='git switch develop'
|
|
alias gcb='git switch -c'
|
|
alias gco='git switch'
|
|
else
|
|
alias gcm='git checkout master 2>/dev/null || git checkout main'
|
|
alias gcd='git checkout develop'
|
|
alias gcb='git checkout -b'
|
|
alias gco='git checkout'
|
|
fi
|
|
|
|
alias gd='git diff'
|
|
alias gds='git diff --staged'
|
|
|
|
alias gi='git ignore'
|
|
|
|
# show last committed content
|
|
alias gll='git last'
|
|
# show quick log overview
|
|
alias glg='git log --oneline --decorate --graph'
|
|
alias glga='git log --oneline --decorate --graph --remotes --all'
|
|
# show detailed log overview
|
|
alias glog='git log --stat'
|
|
# show detailed log overview with contents
|
|
alias gloog='git log --stat -p'
|
|
|
|
alias gf='git fetch'
|
|
alias gl='git pull'
|
|
|
|
alias gpn='git push --dry-run'
|
|
alias gp='git push'
|
|
alias gpf!='git push --force'
|
|
alias gpm='git pushmerge'
|
|
alias gpa='git pushall'
|
|
|
|
alias grv='git remote -v'
|
|
|
|
alias grs='git restore --staged'
|
|
alias grs!='git restore'
|
|
|
|
alias grb='git rebase'
|
|
alias grbi='git rebase -i'
|
|
alias grbc='git rebase --continue'
|
|
alias grbm='git rebase master || git rebase main'
|
|
|
|
alias gst='git status'
|
|
|
|
alias gstp='git stash pop'
|
|
alias gstl='git stash list'
|
|
alias gstL='git stash list --stat'
|
|
if version_at_least 2.13 "$git_version"; then
|
|
alias gsta='git stash push'
|
|
else
|
|
alias gsta='git stash save'
|
|
fi
|
|
|
|
unset -v git_version
|