diff --git a/fish/config.fish b/fish/config.fish index 0e49eea..f75f56b 100644 --- a/fish/config.fish +++ b/fish/config.fish @@ -84,16 +84,47 @@ alias lla 'll -a' alias mkdir 'mkdir -p' # Git -alias gst 'git status -sb' +alias ga 'git add' +alias gb 'git branch' +alias gba 'git branch -a' +alias gc 'git commit -v' +alias gca 'git commit -v -a' +alias gcam 'git commit --amend' +alias gcan 'git commit --amend --no-edit' alias gd 'git diff -- . ":(exclude)yarn.lock"' +alias gd 'git diff -- . ":(exclude)yarn.lock"' # Show differences between index and working tree +alias gdc 'git diff --cached' # Show changes in next commit (differences between index and last commit) +alias gdh 'git diff head' # Show difference between files in working tree and last commit +alias gdt 'git difftool' +alias gfa 'git fetch --all' +alias gg 'git log' +alias ghi 'git hist' alias gl 'git pull' alias glr 'git pull --rebase' alias glu 'git config user.name "Stefan Imhoff" && git config user.email "stefan@imhoff.name";' alias glx 'git config user.name "Stefan Imhoff" && git config user.email "stefan.imhoff@xing.com";' +alias gmb 'git merge-base master HEAD' alias gp 'git push' alias gpf 'git push --force-with-lease' +alias gpp 'PATCHNAME=`git branch 2> /dev/null | sed -e "/^[^*]/d" -e "s/* \(.*\)/\1/"`-`date "+%Y-%m-%d-%H%M.patch"`; git diff --full-index master > ../patches/$PATCHNAME' +alias gpu 'git push -u origin HEAD' +alias gpv 'git push --no-verify' +alias grb 'git rebase master' +alias grbc 'git rebase --continue' +alias grbi 'git rebase -i ' +alias grbs 'git rebase --skip' +alias gru 'git remote update' +alias gsb 'git show-branch' +alias gsl 'git submodule foreach git pull' +alias gst 'git status -sb' +alias gsu 'git submodule update' +alias gu 'git up' alias gw 'git whatchanged' +alias gw 'git worktree' +alias gwa 'git worktree add' # +alias gwl 'git worktree list' alias gwp 'git whatchanged -p' +alias gwr 'git worktree remove' # alias lg 'lazygit' # Vim/Neovim