Subject: Re: [boost] [githelp] Pulling to arbitrary branch?
From: Vladimir Prus (vladimir_at_[hidden])
Date: 2014-12-29 13:27:36
On 12/29/2014 08:33 PM, Rene Rivera wrote:
>> Somewhat better approach is:
>> git fetch https://github.com/jessicah/predef.git
>> git cherry-pick FETCH_HEAD^
>> git cherry-pick FETCH_HEAD
>> <review merge for correctness, run tests>
>> git push
>> This will apply two comments in the pull request individually, making
>> nicer history.
> Did the latter since I like nicer histories always. It worked great :-) One
> issue I noticed though is that it doesn't show the merge on the graph
> (from the pull branch to the develop branch). But I guess that
It's either one or another. Git only records complete merges of tree states, it does not record
cherry-pick. So if you prefer nicer history in case of small pull requests, you get no merge arcs.
It seems fine to me, it's part of having nicer history for small changes.
-- 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