Subject: Re: [boost] [Git] Pull requests and rebasing
From: Vladimir Prus (vladimir_at_[hidden])
Date: 2015-04-16 10:32:31
On 04/16/2015 02:00 PM, John Maddock wrote:
> So I have a rebase vs pull question:
> Lets say I have a PR, if I merge that to my local tree using "git pull --rebase remote-repro branch-name" then I get a nice clean history
> locally without those pesky merge commits cluttering everything up. But...
> Now I can't fast-forward when I push to the remote, *because I've changed the existing history of the develop branch*. Would this not be a)
> bad form, and b) potentially dangerous to push to the remote develop branch?
What I do, for pull requests, is either:
git fetch <repo/branch that github tells me>
git cherry-pick FETCH_HEAD
git am 17.patch
The first is fine for single-commit pull requests, the second is fine for multi-commit ones.
-- Vladimir Prus CodeSourcery / Mentor Embedded http://vladimirprus.com
Boost list run by bdawes at acm.org, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk