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.

Sign up for GitHub

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

Jump to bottom

Fetch origin and rebase against origin with git-up #672

Merged
merged 1 commit into from
Jun 18, 2020
Merged

Fetch origin and rebase against origin with git-up #672

merged 1 commit into from
Jun 18, 2020

Conversation

geoffharcourt
Copy link
Collaborator

@geoffharcourt geoffharcourt commented Jun 18, 2020 •
edited
Loading

In f252ba4 we lost some of the functionality of git-up. This change
brings back rebasing against the origin's reference and not the local
reference of the main branch. We also explicitly fetch from origin now
to be sure we're current before rebasing.

Close #671

@geoffharcourt geoffharcourt mentioned this pull request Jun 18, 2020
Closed
geoffharcourt added a commit that referenced this pull request Jun 18, 2020
@geoffharcourt
Fetch origin and rebase against origin with git-up
f4a0f87 
In f252ba4 we lost some of the functionality of `git-up`. This change
brings back rebasing against the origin's reference and not the local
reference of the main branch. We also explicitly fetch from `origin` now
to be sure we're current before rebasing.

Close #672
@geoffharcourt
Fetch origin and rebase against origin with git-up
691b487 
In f252ba4 we lost some of the functionality of `git-up`. This change
brings back rebasing against the origin's reference and not the local
reference of the main branch. We also explicitly fetch from `origin` now
to be sure we're current before rebasing.

Close #671
@geoffharcourt geoffharcourt merged commit 2e3d643 into master Jun 18, 2020
@geoffharcourt geoffharcourt deleted the gh-fix-git-up branch June 18, 2020 17:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@purinkle purinkle purinkle approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

git up now rebases against master and not origin/master
2 participants
@geoffharcourt @purinkle