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
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
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
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
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
> 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
>>
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
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
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
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
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
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
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
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
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
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,
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
17 matches
Mail list logo