[git-users] Re: help with combine repositories

2012-05-28 Thread Stefan Szabo
I could actively tell git that two trees are the same. I'll keep my eyes open for an answer to this one on this list, as this interests me as much as it does you. This is key for your problem. But I can tell you this much: over here, where I'm working, we cloned entire reposes -- history and all

Re: [git-users] Using Git in a web development environment (specifically with Coda 2 and a web server)

2012-05-28 Thread Serge Matveenko
On Mon, May 28, 2012 at 3:57 AM, Heronymo Allen heron...@gmail.com wrote: Locally, I've got my dev folder. On the server, I set up a git repository in the folder that contains test.domain.com, as well as another repository in the folder that contains the domain.com files. This means I'll have

[git-users] git freezes when writing objects

2012-05-28 Thread Collin Day
Hi all, I am using git/gitolite for version control on my laptop. After creating a repo with gitolite and cloning it using git clone git@localhost:myrepo and then filling it with files, it always seems to hang when writing objects. For example - here I am trying to commit 30 files with the

[git-users] git freezes when writing objects

2012-05-28 Thread Thomas Ferris Nicolaisen
Have you tried pushing to a normal repository over ssh without gitolite? -- 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/-/MRrIP0NI-JAJ. To post to this

[git-users] merge=ours in .gitattributes VS git merge master --strategy=ours

2012-05-28 Thread howard chen
(Have posted this question in SO already: http://stackoverflow.com/questions/10779235/prevent-merging-a-file-from-master-with-git) I want to a file that will not be merged ever between branches, e.g. config.php What I found that by using config.php merge=ours in the .gitattributes does not

[git-users] Re: git freezes when writing objects

2012-05-28 Thread Collin Day
No - but I figured out what the problem was. Turns out that I had hpn (high performance) enabled on my ssh which is currently broken. I rebuilt with that disabled and everything was fine. Thanks! On Monday, May 28, 2012 3:42:28 AM UTC-6, Thomas Ferris Nicolaisen wrote: Have you tried

[git-users] Git SVN clone only one remote branch

2012-05-28 Thread Eduardo
Hello guys, That´s my first experience with git and already have a problem to solve. We work here in colaboration with others remote teams in a big project. Each one of us have a exclusive branch in SVN central repository, and the main trunk is used only from the central team. I want to