commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Matt Sicker <boa...@gmail.com>
Subject Re: [ALL][Math] git pull requests: how?
Date Thu, 09 Mar 2017 17:34:42 GMT
A merge commit is an additional commit unless you squash what you're
merging. The entire history should be available. You can use --ff to only
allow a fast forward commit so it doesn't add a merge commit, but then the
branch you're merging has be to rebased on the one you're merging into.

On 9 March 2017 at 09:08, Gilles <gilles@harfang.homelinux.org> wrote:

> On Thu, 9 Mar 2017 09:38:55 -0500, Rob Tompkins wrote:
>
>> On Mar 9, 2017, at 8:08 AM, Gilles <gilles@harfang.homelinux.org> wrote:
>>>
>>> On Wed, 8 Mar 2017 10:37:44 -0600, Matt Sicker wrote:
>>>> The "write to a PR branch" was something I mentioned in a different
>>>> email.
>>>>
>>>> If you want a single command to merge a PR into master, assuming you've
>>>> already set up "github" as your github remote:
>>>>
>>>
>>> $ git remote -v
>>> github    https://github.com/apache/commons-math.git (fetch)
>>> github    https://github.com/apache/commons-math.git (push)
>>> origin    https://git-wip-us.apache.org/repos/asf/commons-math.git
>>> (fetch)
>>> origin    https://git-wip-us.apache.org/repos/asf/commons-math.git
>>> (push)
>>>
>>>
>>>> git pull github pull/42
>>>> git push
>>>>
>>>> Something like that should work.
>>>>
>>>
>>> $ git pull github pull/50
>>> fatal: Couldn't find remote ref pull/50
>>>
>>> Am I missing something?
>>>
>>>
>> Try
>>
>> git pull github pull/#/head
>>
>
> It successfully performs a merge into the current branch, but does
> not preserve the commit history (only the merge appears in "git log").
>
> IIRC, the generated instructions[1] would lead to the contributor's
> commit being referenced properly.
>
> Regards,
> Gilles
>
> [1] Such as in:
>       https://issues.apache.org/jira/browse/NUMBERS-4
>
>
>
>
>> -Rob
>>
>> Regards,
>>> Gilles
>>>
>>> [...]
>>>>
>>>
>>>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
> For additional commands, e-mail: dev-help@commons.apache.org
>
>


-- 
Matt Sicker <boards@gmail.com>

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message