linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-02-06 02:51:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Force rebase on pull action

Browse source 
Nobody likes merge commits on pull, cause they pollute history
This commit is contained in:
Stanislav Mekhonoshin 2013-05-14 11:36:23 +04:00
commit fcc982da8e
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
plugins/git/git.plugin.zsh
View file

@ -93,11 +93,11 @@ function current_repository() {
} }
# these aliases take advantage of the previous function # these aliases take advantage of the previous function
alias ggpull='git pull origin $(current_branch)' alias ggpull='git pull --rebase origin $(current_branch)'
compdef ggpull=git compdef ggpull=git
alias ggpush='git push origin $(current_branch)' alias ggpush='git push origin $(current_branch)'
compdef ggpush=git compdef ggpush=git
alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)' alias ggpnp='git pull --rebase origin $(current_branch) && git push origin $(current_branch)'
compdef ggpnp=git compdef ggpnp=git
# Pretty log messages # Pretty log messages