Hi,
On Fri, Sep 15, 2017 at 08:25:40AM +0100, Chris Lamb wrote:
> Package: git-buildpackage
> Version: 0.8.18
> Severity: wishlist
>
> Hi,
>
> Sometimes my local repo has skewed so badly or I just don't trust it
> enough that just want to reset it to what is upstream. I'm currently
> doing this with manual calls:
>
> git checkout pristine-tar
> git reset --hard origin/pristine-tar
> git checkout upstream
> git reset --hard origin/upstream
> git checkout master
> git reset --hard origin/master
>
> .. as ``gbp pull --force`` seems to want to do a merge.
--force does a reset for all branches except for the branch you're on
which is somewhat inconsistent:
https://github.com/agx/git-buildpackage/pull/53
So the best thing would probably be to reset that branch as well.
Cheers,
-- Guido
>
> It would be great if there was a --reset option to do the above or some
> equivalent thereof.
>
>
> Best wishes,
> --
> ,''`.
> : :' : Chris Lamb
> `. `'` la...@debian.org / chris-lamb.co.uk
> `-
>
