search

jhillyerd / plugin-git

Git aliases plugin for the Fish shell (similar to oh-my-zsh git)
MIT License
607 stars 85 forks source link

Rebasing on origin master would be nice #75

Closed torhovland closed 1 year ago

torhovland commented 2 years ago 
git fetch origin (__git.default_branch); and git rebase origin/(__git.default_branch)
jhillyerd commented 2 years ago

Does sound like a good idea. If already in https://github.com/robbyrussell/oh-my-zsh/wiki/Plugin:git we should attempt to match their alias name

torhovland commented 2 years ago

Good point. The last part is grbom there. For the first part, I suppose the user will do gfo (__git.default_branch) or simply gfo, gfa or gf.

I see there is a discussion on https://github.com/ohmyzsh/ohmyzsh/pull/8988

This one would be even nicer, as it does everything in one command, but it hasn't been merged: https://github.com/ohmyzsh/ohmyzsh/pull/10261

jmeridth commented 2 years ago

Could you get this with gpr origin master while on feature branch? alias here

Update: Yep, just like you mentioned is happening in https://github.com/ohmyzsh/ohmyzsh/pull/10261

jhillyerd commented 2 years ago

Those got merged it seems,

alias gupom='git pull --rebase origin $(git_main_branch)'
alias gupomi='git pull --rebase=interactive origin $(git_main_branch)'

we can do the same I think

jhillyerd commented 1 year ago

I believe #91 resolved this.