[git-users] Re: Problem with moving everything into a subdirectory; merge conflicts

2013-01-08 Thread Carsten Fuchs
Hi Philip, Am 2013-01-08 00:02, schrieb Philip Oakley: That is, do I understand correctly that if I had used the default merge strategy, and somehow solved all the conflicts (so that none of the files had been changed from F), the result would have technically been exactly the same?

[git-users] Re: git push

2013-01-08 Thread Thomas Ferris Nicolaisen
On Tuesday, January 8, 2013 8:47:10 AM UTC+1, k-joseph wrote: Hi every one, am kindly requesting for your assistance, i successfully push to a remote branch on my account for the first time( first push where i use git push origin name of the branch) but when am pushing the second or any

[git-users] git write-tree followed by git diff-files

2013-01-08 Thread dimwethion
Dear Git users, I have some difficulties to understand, why git read-tree followed by a git diff-files actually shows some changes between the index and working directory. The attached script demonstrates the observation. The output on my computer can be seen in the following (note that echo

[git-users] Re: git write-tree followed by git diff-files

2013-01-08 Thread Sebastian Bauer
Okay, I found an explanation myself in the manual of git update-index. It seems that the --refresh option is needed. --

Re: [git-users] download a directory or file without clone the whole tree

2013-01-08 Thread Konstantin Khomoutov
On Mon, 7 Jan 2013 10:39:53 +0800 lei yang yanglei.f...@gmail.com wrote: I find my treeA want to have another treeB's dir, I don't want to clone the whole treeB, I don't know can we do it with git the get treeB's dir You can't fetch just a directory from a remote tree as Git does not

Re: [git-users] Issue in checking out repo in GIT in eclipse

2013-01-08 Thread Konstantin Khomoutov
On Mon, 7 Jan 2013 19:54:49 -0800 (PST) gaug...@gmail.com wrote: [...] I have installed EGIT plugin my eclipse. I tried checking importing the files from using the plugin by choosing the URI option in eclipse and got an Unknown Host Exception. These are the setting i gave: 1) URI :

[git-users] Management of a puppet tree and multiple developers

2013-01-08 Thread Ray Shaw
I'm trying to solve a problem with git, but I think I'm going about it the wrong way. I've tried searching for a lot of related terms, but either the answer isn't out there, or I'm not trying the right words. It's possible git can't do what I want, but I hope so. We've been using git to

Re: [git-users] Management of a puppet tree and multiple developers

2013-01-08 Thread John McKown
I don't have a good answer, being a newbie. But I'm wondering why you have people doing a git push on not ready for prime-time changes. The OSX people, or just each individual, can keep a local branch in their working directory. When they need to move a file or files into development, they can do

Re: [git-users] Management of a puppet tree and multiple developers

2013-01-08 Thread Philip Oakley
More people essentially means you will want more branches (complexity got just too big for the two branch model), probably one per feature, branched off devel and re-merged [either feature - devel; or devel(latest) -feature depending on flow] whenever a feature is ready for testing. Once a

[git-users] Can Git do all of this?

2013-01-08 Thread Greg
Can Git do some or all of the things listed below? If so, I'd appreciate some recommendations for each piece of the puzzle... TIA! I am attempting to select a good SCM for our particular development circumstances, and Git has been selected for the short-list. We have a small development

[git-users] can't have a directory named bundle?

2013-01-08 Thread msoulier
Hi, I happened to create a subdirectory in my working set called bundle, and I noticed that git ignored it. Why is that? And what if I need such a directory? Thanks, Mike --

Re: [git-users] can't have a directory named bundle?

2013-01-08 Thread William Mizuta
Do you a have a file named .gitignore in the project root? If you have, all files and directories listed in this file will be ignored by git. William Seiti Mizuta @williammizuta Desenvolvedor da Caelum On Wed, Jan 9, 2013 at 12:34 AM, msoulier msoul...@digitaltorque.ca wrote: Hi, I

Re: [git-users] can't have a directory named bundle?

2013-01-08 Thread Michael Soulier
On 2013-01-08, at 11:18 PM, William Mizuta william.miz...@gmail.com wrote: Do you a have a file named .gitignore in the project root? If you have, all files and directories listed in this file will be ignored by git. No, I don't. Test this yourself, I doubt there's anything special about my