Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

don't try to rebase local branch #127

Open
gnagy opened this issue Jan 6, 2015 · 0 comments
Open

don't try to rebase local branch #127

gnagy opened this issue Jan 6, 2015 · 0 comments

Comments

@gnagy
Copy link

gnagy commented Jan 6, 2015

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

1 participant