Re: git push weird?

2010-06-15 Thread Xiangfu Liu
Hi git is offline version control. so if you committed in local several times, when you git push. it will push all of your committed to server. hopt this can help. On 06/15/2010 07:36 PM, Thien-Thi Nguyen wrote: I just did my first push to the savannah repo, and it did not go as i expected:

Re: git push weird?

2010-06-15 Thread Thien-Thi Nguyen
() Xiangfu Liu xiangf...@gmail.com () Tue, 15 Jun 2010 22:41:35 +0800 git is offline version control. so if you committed in local several times, when you git push. it will push all of your committed to server. hopt this can help. Thanks. I think i should have done a git rebase

Re: git push weird?

2010-06-15 Thread Ludovic Courtès
Hello, Thien-Thi Nguyen t...@gnuvola.org writes: I just did my first push to the savannah repo, and it did not go as i expected: the web interface shows three commits instead of one. These are “merge commits”. Please avoid pushing any merge commits as they make the history non-linear for no

Re: git push weird?

2010-06-15 Thread Thien-Thi Nguyen
() l...@gnu.org (Ludovic Courtès) () Tue, 15 Jun 2010 20:56:19 +0200 These are “merge commits”. Please avoid pushing any merge commits as they make the history non-linear for no reason in such situations. See ‘git rebase’ and the like for how to avoid it. OK. Besides, did you mean

Re: git push weird?

2010-06-15 Thread Ludovic Courtès
Hi, Thien-Thi Nguyen t...@gnuvola.org writes: Yes, but now i believe that that was fuzzy thinking, not to mention in disregard of my agreement to not do so made several months ago (which i didn't remember until just after pressing RET -- sigh). :-( Heh, no problem. ;-) I will push only

Re: git push weird?

2010-06-15 Thread Andy Wingo
Greets, On Tue 15 Jun 2010 21:39, Thien-Thi Nguyen t...@gnuvola.org writes: () l...@gnu.org (Ludovic Courtès) () Tue, 15 Jun 2010 20:56:19 +0200 Besides, did you mean to push to ‘master’? Yes, but now i believe that that was fuzzy thinking, not to mention in disregard of my agreement

Re: git push weird?

2010-06-15 Thread Thien-Thi Nguyen
() Andy Wingo wi...@pobox.com () Tue, 15 Jun 2010 23:07:47 +0200 Just for readability I have rebased the commits. The gnulib commit will get overwritten at the next gnulib import. GUILE_CONFIG_SCRIPT is fine. OK, thanks for cleaning up my mess. It's good to have tmpfile, but I wonder

Re: git push weird?

2010-06-15 Thread Thien-Thi Nguyen
() Andy Wingo wi...@pobox.com () Wed, 16 Jun 2010 00:15:47 +0200 Can you give a use case for when you want to know if a port is a tmpfile? Off the top of my head, nothing serious, only for general debugging control freakery. I think the last time i used it was when a child process (of