[PATCH] notes: accept any ref for merge

2014-09-19 Thread Scott Chacon
tes push refspec. Signed-off-by: Scott Chacon --- notes.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/notes.c b/notes.c index 5fe691d..78d58af 100644 --- a/notes.c +++ b/notes.c @@ -1293,7 +1293,7 @@ int copy_note(struct notes_tree *t, void expand_notes_ref(struct

Re: material for git training sessions/presentations

2014-05-04 Thread Scott Chacon
The GitHub training team has all of their materials open sourced under a CC BY 3.0 license. They're all written in Markdown and hosted on GitHub. You can check them out here, including going through an online rendering of the materials: http://training.github.com/kit/ Scott On Sun, May 4, 2014

Re: Feature Request Google Authenticator Support

2014-01-30 Thread Scott Chacon
Hey, On Thu, Jan 30, 2014 at 6:28 AM, Erik Faye-Lund wrote: > On Thu, Jan 30, 2014 at 5:07 AM, Max Rahm wrote: >> Github supports google authenticator 2-step authentication. I enabled it >> and how can't figure out how to connect to my github account through git. >> I've looked pretty hard in th

Re: git-scm.com website

2015-03-09 Thread Scott Chacon
Hey, On Mon, Mar 9, 2015 at 9:06 AM, David Kastrup wrote: > > On Mon, Mar 9, 2015 at 6:57 AM, Michael J Gruber > > wrote: > >> > >> Since we're talking business: git-scm.com still looks a bit like a > >> ProGit/Github promotion site. I don't have anything against either, and > >> git-scm.com pro

Re: git-scm.com website

2015-03-09 Thread Scott Chacon
Hey, On Mon, Mar 9, 2015 at 10:12 AM, Christian Couder wrote: > A few other points about git-scm.com: > > * as Michael says it "still looks a bit like a ProGit/Github promotion site" > > * some of the pull request can be rejected even if the developers want > them, like this pull request to add b

Re: Git Merge 2013 Conference, Berlin

2013-05-10 Thread Scott Chacon
Hey, On Fri, May 10, 2013 at 9:10 PM, Sebastian Schuberth wrote: > On 23.01.2013 20:27, Scott Chacon wrote: > >> As you may remember, we did not have a GitTogether last year. Since I >> miss drinking and talking Git nerdiness with all of you, I'm going to >> try o

Re: Important articles on git-scm.com no more accessible

2013-05-05 Thread Scott Chacon
Sorry about that - a recent PR that was merged changed the routes that handled this for some reason. I just added the historical routes back and they all should work again. Scott On Wed, May 1, 2013 at 8:57 PM, Konstantin Khomoutov wrote: > On Wed, 1 May 2013 14:38:02 -0400 > Jeff King wrote:

Re: The GitTogether

2012-09-21 Thread Scott Chacon
Actually, responding to some of the feedback I've been getting, I'm thinking of having a single day of just core developers and then a day or two of users, or vice versa, but doing them together in a single event. Then just doing that same pattern in both the EU and the US. Scott On Fri, Sep 21,

Re: Links broken in ref docs.

2012-10-22 Thread Scott Chacon
s on scm-git.org/docs simply reload the page. >>> >>> For example, all of Sharing and Updating section simply reload the >>> docs page. And tons others. Must be a broken link or routing problem. >>> Repros on FF 14.0.1 and Chrome. Good luck! >>> >&

The GitTogether

2012-07-26 Thread Scott Chacon
For the last few years, there has been a gathering of Gitty people in Mountain View directly following the GSoC Mentor Summit that is referred to as a GitTogether: https://git.wiki.kernel.org/index.php/GitTogether A few of us have been talking about what we would like to do this year and thinking

Re: Git-aware HTTP transport docs

2013-02-12 Thread Scott Chacon
I don't believe it was ever merged into the Git docs. I have a copy of it here: https://www.dropbox.com/s/pwawp8kmwgyc3w2/http-protocol.txt Scott On Tue, Feb 12, 2013 at 5:34 PM, H. Peter Anvin wrote: > Hi Shawn, > > You wrote a really great protocol spec for the smart HTTP protocol back > in

Re: Git Merge 2013 Conference, Berlin

2013-02-18 Thread Scott Chacon
uccess. Scott On Mon, Feb 18, 2013 at 1:17 PM, Jeff King wrote: > On Mon, Feb 18, 2013 at 09:52:34PM +0100, Thomas Rast wrote: > >> Scott Chacon writes: >> >> > We're starting off in Berlin, May 9-11th. GitHub has secured >> > conference space at the Radiss

Re: Git Merge 2013 Conference, Berlin

2013-02-19 Thread Scott Chacon
Hey, On Tue, Feb 19, 2013 at 7:41 AM, Michael J Gruber wrote: > Michael J Gruber venit, vidit, dixit 19.02.2013 16:20: >> Well, all days are listed as "sold out" on the eventbrite site. Maybe >> it's because eventbrite has "trouble connecting to facebook" because I >> "don't have facebook"? No,

Re: Git Merge 2013 Conference, Berlin

2013-02-19 Thread Scott Chacon
Hey, On Tue, Feb 19, 2013 at 11:19 AM, Junio C Hamano wrote: > Scott Chacon writes: > >> On Tue, Feb 19, 2013 at 7:41 AM, Michael J Gruber >> wrote: >>> Michael J Gruber venit, vidit, dixit 19.02.2013 16:20: >>>> Well, all days are listed as "sold

Re: Git Merge 2013 Conference, Berlin

2013-02-19 Thread Scott Chacon
Hey, On Tue, Feb 19, 2013 at 1:26 PM, Junio C Hamano wrote: > Scott Chacon writes: > >> On Tue, Feb 19, 2013 at 11:19 AM, Junio C Hamano wrote: >>> Scott Chacon writes: >>> >>>> On Tue, Feb 19, 2013 at 7:41 AM, Michael J Gruber >>>&