[git-users] Re: git does not update on OSX 10.6

2012-07-06 Thread Thomas Ferris Nicolaisen
On Friday, July 6, 2012 8:43:59 AM UTC+2, dmanexe wrote: I've been using the installer from the Google Code page but it dosen't update my git from 1.7.3.4 to 1.7.11.1. I've ran the installer package, logged out, but it doesn't update. What am I doing wrong? Sounds like you have another Git

[git-users] git push fine, git pull not seeing changed

2012-07-06 Thread Avner Tamir
Hi, we are facing a strange problems: when we push to remote repo code is pushed successfully and we do see the commits and code being pushed via gitweb. when we try to pull from remote repo, we are getting a message all up to date but we do not see new code. to make things more interesting we

Re: [git-users] git push fine, git pull not seeing changed

2012-07-06 Thread Konstantin Khomoutov
On Fri, 6 Jul 2012 01:40:56 -0700 (PDT) Avner Tamir avner.ta...@hp.com wrote: we are facing a strange problems: when we push to remote repo code is pushed successfully and we do see the commits and code being pushed via gitweb. when we try to pull from remote repo, we are getting a message

[git-users] git erase everything

2012-07-06 Thread lem torov
i was using netbeans ide and as CVS i was using git included into IDE. once i lanch standalone git-msys in my project directory git branch showed me ** no branch master you are not in any branch * i did *git checkout master* and i lost like 5 weeks of my work. if there is any way to restore

Re: [git-users] git erase everything

2012-07-06 Thread Aneesh Bhasin
Hi Lem, On Fri, Jul 6, 2012 at 4:25 PM, lem torov ulem...@gmail.com wrote: i was using netbeans ide and as CVS i was using git included into IDE. once i lanch standalone git-msys in my project directory git branch showed me * no branch   master   you are not in any branch i did git

Re: [git-users] git erase everything

2012-07-06 Thread Konstantin Khomoutov
On Fri, 6 Jul 2012 03:55:03 -0700 (PDT) lem torov ulem...@gmail.com wrote: i was using netbeans ide and as CVS i was using git included into IDE. once i lanch standalone git-msys in my project directory git branch showed me ** no branch master you are not in any branch * i did

Re: [git-users] git erase everything

2012-07-06 Thread lem torov
I follow you tutorial -- You received this message because you are subscribed to the Google Groups Git for human beings group. To view this discussion on the web visit https://groups.google.com/d/msg/git-users/-/8oh273MuSMoJ. To post to this group, send email to git-users@googlegroups.com. To

Re: [git-users] git erase everything

2012-07-06 Thread lem torov
пятница, 6 июля 2012 г., 15:18:39 UTC+4 пользователь Konstantin Khomoutov написал: i was using netbeans ide and as CVS i was using git included into IDE. once i lanch standalone git-msys in my project directory git branch showed me ** no branch master you are not in

Re: [git-users] git erase everything

2012-07-06 Thread Konstantin Khomoutov
On Fri, 6 Jul 2012 04:29:45 -0700 (PDT) lem torov ulem...@gmail.com wrote: I follow you tutorial Actually, I gather that this more modern guide [1] written by the same author is indeed better (linked from the original tutorial). 1.

Re: [git-users] git erase everything

2012-07-06 Thread lem torov
пятница, 6 июля 2012 г., 15:45:25 UTC+4 пользователь Konstantin Khomoutov написал: I follow you tutorial Actually, I gather that this more modern guide [1] written by the same author is indeed better (linked from the original tutorial). 1.

[git-users] Re: git erase everything

2012-07-06 Thread lem torov
As do understand git copies all files into .git/objects folder and all this files compressed so i cant use grep to find files which i need. if there tools to view tree of commits and files include losted commits so i can recover everything manually. i need at list to find one latest build jar

[git-users] How to add the branch from another tree to my local branch

2012-07-06 Thread lei yang
As the title, thanks in advance Lei -- You received this message because you are subscribed to the Google Groups Git for human beings group. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com.

Re: [git-users] git erase everything

2012-07-06 Thread Konstantin Khomoutov
On Fri, 6 Jul 2012 05:01:55 -0700 (PDT) lem torov ulem...@gmail.com wrote: I follow you tutorial Actually, I gather that this more modern guide [1] written by the same author is indeed better (linked from the original tutorial). 1.

[git-users] The commit share

2012-07-06 Thread lei yang
Hi expert, With git merge-base I get the commitid1 for the merge base . How could I get the shared commit id since the commitid1 for the two branch? Thanks Lei -- You received this message because you are subscribed to the Google Groups Git for human beings group. To post to this group, send

Re: [git-users] Re: git erase everything

2012-07-06 Thread Konstantin Khomoutov
On Fri, 6 Jul 2012 05:07:16 -0700 (PDT) lem torov ulem...@gmail.com wrote: As do understand git copies all files into .git/objects folder and all this files compressed so i cant use grep to find files which i need. if there tools to view tree of commits and files include losted commits so i

Re: [git-users] How to add the branch from another tree to my local branch

2012-07-06 Thread Konstantin Khomoutov
On Fri, 6 Jul 2012 20:34:34 +0800 lei yang yanglei.f...@gmail.com wrote: As the title, thanks in advance Please try to rephrase as it appears you're using wrong terminology. A tree is a collection of files. For instance, each commit refers to a tree which captures the state of files that

[git-users] Re: The commit share

2012-07-06 Thread Thomas Ferris Nicolaisen
Hi, Could you explain what you mean with *the shared commit id since the commitid1 for the two branch*? Perhaps provide an example? On Friday, July 6, 2012 2:39:44 PM UTC+2, lei yang wrote: Hi expert, With git merge-base I get the commitid1 for the merge base . How could I get the

Re: [git-users] Re: git clone fails with error: RPC failed; result=22, HTTP code = 401

2012-07-06 Thread Konstantin Khomoutov
On Fri, 6 Jul 2012 07:27:36 -0700 (PDT) Thomas Ferris Nicolaisen tfn...@gmail.com wrote: I think this is a bit on the advanced side of things we usually answer on this list, so you could try asking on the git development list (described here http://git-scm.com/community). He already did that.

[git-users] Re: The commit share

2012-07-06 Thread lei yang
I'm on the train with my phone,tomrrow I would give you example. On Friday, July 6, 2012, Thomas Ferris Nicolaisen wrote: Hi, Could you explain what you mean with *the shared commit id since the commitid1 for the two branch*? Perhaps provide an example? On Friday, July 6, 2012 2:39:44 PM

Re: [git-users] git erase everything

2012-07-06 Thread PJ Weisberg
On Fri, Jul 6, 2012 at 3:55 AM, lem torov ulem...@gmail.com wrote: i was using netbeans ide and as CVS i was using git included into IDE. once i lanch standalone git-msys in my project directory git branch showed me * no branch master you are not in any branch i did git checkout

[git-users] Marking code blocks consistently ignored for add/commit

2012-07-06 Thread Tim Chase
I've got a number of Python modules where the debugging code changes on a regular basis, but is of no relevance to the history of the file. For a snippet, it might be something like def real_code(x): return do_stuff(x) # version everything above the next

[git-users] Re: Marking code blocks consistently ignored for add/commit

2012-07-06 Thread Les Nightingill
is it possible to pull all the test-only pieces of code from a test_only file, that is ignored by git. Include the test code in such a way that if the test_only file is not present, the production code still holds together. On Friday, July 6, 2012 11:42:58 AM UTC-7, Tim Chase wrote: I've got