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

[RFC] gbp-pull: similar force update strategy for all branches #53

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[RFC] gbp-pull: similar force update strategy for all branches #53

wants to merge 1 commit into from

Commits on Dec 14, 2018

  1. gbp-pull: similar force update strategy for all branches 

    When using --force, treat non-checked-out branches similarly to the
current branch. That is, do git merge, instead of just setting the ref.

Also, renames fast_forward_branch() to update_branch() to better match
the functionality.

Signed-off-by: Markus Lehtonen <[email protected]>
    @marquiz
    marquiz committed Dec 14, 2018
    Configuration menu
    Copy the full SHA
    d5abdd2 View commit details
    Browse the repository at this point in the history