Re: [ALL][Math] git pull requests: how?

2017-03-09 Thread Gilles
On Thu, 9 Mar 2017 12:01:08 -0600, Matt Sicker wrote: Try viewing the log like this: git log --oneline --decorate --graph It might be farther back in time, Oh yes, of course, you are right. I tested this with a fairly old pull request! Thanks and sorry for the noise, Gilles so the added

Re: [ALL][Math] git pull requests: how?

2017-03-09 Thread Matt Sicker
Try viewing the log like this: git log --oneline --decorate --graph It might be farther back in time, so the added commits won't show up at the top of the normal git log format. On 9 March 2017 at 11:48, Gilles wrote: > On Thu, 9 Mar 2017 11:34:42 -0600, Matt

Re: [ALL][Math] git pull requests: how?

2017-03-09 Thread Gilles
On Thu, 9 Mar 2017 11:34:42 -0600, Matt Sicker wrote: 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

Re: [ALL][Math] git pull requests: how?

2017-03-09 Thread Matt Sicker
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

Re: [ALL][Math] git pull requests: how?

2017-03-09 Thread Gilles
On Thu, 9 Mar 2017 09:38:55 -0500, Rob Tompkins wrote: On Mar 9, 2017, at 8:08 AM, Gilles 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

Re: [ALL][Math] git pull requests: how?

2017-03-09 Thread Rob Tompkins
> On Mar 9, 2017, at 8:08 AM, Gilles 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 >>

Re: [ALL][Math] git pull requests: how?

2017-03-09 Thread Gilles
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

Re: [ALL][Math] git pull requests: how?

2017-03-08 Thread Matt Sicker
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 pull github pull/42 git push Something like that should work. Since you're not running the git

Re: [ALL][Math] git pull requests: how?

2017-03-08 Thread Gilles
Hi. On Tue, 7 Mar 2017 22:06:11 -0600, Matt Sicker wrote: Found this link while trying to remember how to do this: https://help.github.com/articles/checking-out-pull-requests-locally/ Same docs as above, just from the source. It sounds like you can't write to a PR branch even if the author

Re: [ALL][Math] git pull requests: how?

2017-03-07 Thread Matt Sicker
Found this link while trying to remember how to do this: https://help.github.com/articles/checking-out-pull-requests-locally/ Same docs as above, just from the source. It sounds like you can't write to a PR branch even if the author allows it, but the docs could be out of date (it happens!). On

Re: [ALL][Math] git pull requests: how?

2017-03-02 Thread Gilles
On Thu, 2 Mar 2017 09:35:53 -0600, Matt Sicker wrote: Is the different behavior caused by svn versus git mirroring? The "Math" and "Numbers" projects both use git. Gilles That read-only branch feature is really cool. Some of this info might be useful to include in the template readme files

Re: [ALL][Math] git pull requests: how?

2017-03-02 Thread Matt Sicker
Is the different behavior caused by svn versus git mirroring? That read-only branch feature is really cool. Some of this info might be useful to include in the template readme files and such for commons. On 2 March 2017 at 06:09, Gilles wrote: > On Thu, 2 Mar 2017

Re: [ALL][Math] git pull requests: how?

2017-03-02 Thread Gilles
On Thu, 2 Mar 2017 11:30:17 +, sebb wrote: This info (when validated) should be added to the Wiki: https://wiki.apache.org/commons/UsingGIT ... Oh, it already is there at the end Indeed, there is information there. That works: $ git fetch github pull/72/head:fix-foo-in-bar But is it

Re: [ALL][Math] git pull requests: how?

2017-03-02 Thread sebb
This info (when validated) should be added to the Wiki: https://wiki.apache.org/commons/UsingGIT ... Oh, it already is there at the end On 2 March 2017 at 10:50, Gilles wrote: > On Wed, 1 Mar 2017 22:51:54 -0600, Matt Sicker wrote: >> >> Normally the GitHub

Re: [ALL][Math] git pull requests: how?

2017-03-02 Thread Gilles
On Wed, 1 Mar 2017 22:51:54 -0600, Matt Sicker wrote: Normally the GitHub email gives you the proper command to use to pull the PR into your local git which you can merge and push (which merges the PR once GitHub gets updated from apache.org). As for making sure that email gets sent, if it's

Re: [ALL][Math] git pull requests: how?

2017-03-01 Thread Matt Sicker
Normally the GitHub email gives you the proper command to use to pull the PR into your local git which you can merge and push (which merges the PR once GitHub gets updated from apache.org). As for making sure that email gets sent, if it's not, file an INFRA ticket about it. I've never tried it,

[ALL][Math] git pull requests: how?

2017-03-01 Thread Gilles
Hi. How should the project be configured such that the request posted here: https://issues.apache.org/jira/browse/MATH-1405 is as easy to handle as the one posted here: https://issues.apache.org/jira/browse/NUMBERS-4 ? Thanks, Gilles