prezi / pride

Manages a pride of Gradle modules
Other
71 stars 13 forks source link

don't try to rebase local branch #127

Open gnagy opened 9 years ago

gnagy commented 9 years ago

If i work on a branch that is local only and doesn't exist on origin, git throws an error. Instead, it should just fetch the changes and not attempt a rebase.

Error output: [8/10] Updating boxfish-playback Fetching origin There is no tracking information for the current branch. Please specify which branch you want to rebase against. See git-rebase(1) for details

git rebase <branch>

If you wish to set tracking information for this branch you can do so with:

git branch --set-upstream-to=origin/<branch> wip

ERROR: Failed to execute "git rebase --autostash" in "/Users/greg/Dev/prides/boxfish/boxfish-playback", exit code: 1