search

thoughtbot / dotfiles

A set of vim, zsh, git, and tmux configuration files.
https://thoughtbot.com
Other
7.99k stars 1.86k forks source link

`git up` now rebases against `master` and not `origin/master` #671

Closed purinkle closed 4 years ago

purinkle commented 4 years ago

Before #667, git up used to fetch the remote and rebase against origin/master.

Now that we are supporting a flexible trunk branch name, it seems that we rebase against master instead.

geoffharcourt commented 4 years ago

@purinkle good spot! Fixing that now.

geoffharcourt commented 4 years ago

I thought this was something broken on my setup. Thanks for finding! https://github.com/thoughtbot/dotfiles/pull/672