Marty Oehme
bb9030f885
Fixed bash alias loading for additional modules by loading both general sh aliases as well as individual bash aliases. Moved git stash push/save aliasing to split between bash/zsh shell since zsh can check for the correct version of git to invoke push command (only part of git since 2.13) and bash simply falls back to save.
65 lines
1.4 KiB
Bash
65 lines
1.4 KiB
Bash
#!/usr/bin/env sh
|
|
|
|
if ! exist git; then
|
|
return 1
|
|
fi
|
|
|
|
# git alias
|
|
|
|
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'
|
|
|
|
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'
|
|
|
|
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'
|
|
|
|
# stash push/save is handled differently by zsh/bash
|
|
alias gstp='git stash pop'
|
|
alias gstl='git stash list'
|
|
alias gstL='git stash list --stat'
|