wilderjds
/
oh-my-zsh
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(git): add `gupom` and `gupomi` aliases (#10261)

Browse Source 
Co-authored-by: Steven Pitts <spitts@teikametrics.com>
master
Steven Pitts 4 years ago committed by GitHub
parent 39b600e9e5
commit e9e8c6b54d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 0 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      plugins/git/README.md
  2. 2
      plugins/git/git.plugin.zsh

2
plugins/git/README.md
Unescape View File

@ -181,6 +181,8 @@ plugins=(... git)
| gupv | git pull --rebase -v | | gupv | git pull --rebase -v |
| gupa | git pull --rebase --autostash | | gupa | git pull --rebase --autostash |
| gupav | git pull --rebase --autostash -v | | gupav | git pull --rebase --autostash -v |
| gupom | git pull --rebase origin $(git_main_branch) |
| gupomi | git pull --rebase=interactive origin $(git_main_branch) |
| glum | git pull upstream $(git_main_branch) | | glum | git pull upstream $(git_main_branch) |
| gwch | git whatchanged -p --abbrev-commit --pretty=medium | | gwch | git whatchanged -p --abbrev-commit --pretty=medium |
| gwip | git add -A; git rm $(git ls-files --deleted) 2> /dev/null; git commit --no-verify --no-gpg-sign -m "--wip-- [skip ci]" | | gwip | git add -A; git rm $(git ls-files --deleted) 2> /dev/null; git commit --no-verify --no-gpg-sign -m "--wip-- [skip ci]" |

2
plugins/git/git.plugin.zsh
Unescape View File

@ -307,6 +307,8 @@ alias gup='git pull --rebase'
alias gupv='git pull --rebase -v' alias gupv='git pull --rebase -v'
alias gupa='git pull --rebase --autostash' alias gupa='git pull --rebase --autostash'
alias gupav='git pull --rebase --autostash -v' alias gupav='git pull --rebase --autostash -v'
alias gupom='git pull --rebase origin $(git_main_branch)'
alias gupomi='git pull --rebase=interactive origin $(git_main_branch)'
alias glum='git pull upstream $(git_main_branch)' alias glum='git pull upstream $(git_main_branch)'
alias gwch='git whatchanged -p --abbrev-commit --pretty=medium' alias gwch='git whatchanged -p --abbrev-commit --pretty=medium'

Write Preview
Loading…
Cancel
Save