Re: [git-users] Pushing files into a subtree

2012-12-14 Thread Dale R. Worley
> From: "Philip Oakley" > > > How, then, do merges handle this information? If the "delta" is that > > ./a/123 was moved into ./b/456, does the merging process understand > > that, and move the same file in the destination directory? Or does it > > only do so if ./a/123 in the destination direc

Re: [git-users] Pushing files into a subtree

2012-12-12 Thread Philip Oakley
From: "Dale R. Worley" Sent: Wednesday, December 12, 2012 5:46 PM From: "Philip Oakley" > OK, so it seems that when you move files around, and then tell git > to > notice that, git will automagically figure out what the moves were. > The O'Reilly book wasn't clear on that. (Nor did it expl

Re: [git-users] Pushing files into a subtree

2012-12-12 Thread Philip Oakley
From: "Dale R. Worley" Sent: Wednesday, December 12, 2012 5:48 PM From: "Philip Oakley" > Another question is this: I believe that the complete repository > and > its status lives in the .git directory. So if I move ./.git to > ../.git, > it has the same effect as if I moved all the normal

Re: [git-users] Pushing files into a subtree

2012-12-12 Thread Dale R. Worley
> From: "Philip Oakley" > > > Another question is this: I believe that the complete repository and > > its status lives in the .git directory. So if I move ./.git to > > ../.git, > > it has the same effect as if I moved all the normal files into a > > subdirectory of ".". Is that correct? >

Re: [git-users] Pushing files into a subtree

2012-12-12 Thread Dale R. Worley
> From: "Philip Oakley" > > > OK, so it seems that when you move files around, and then tell git to > > notice that, git will automagically figure out what the moves were. > > The O'Reilly book wasn't clear on that. (Nor did it explain how git > > can distinguish a move from file that just happe

Re: [git-users] Pushing files into a subtree

2012-11-29 Thread Philip Oakley
From: "Dale R. Worley" To: Sent: Thursday, November 29, 2012 7:50 PM Subject: Re: [git-users] Pushing files into a subtree From: Ryan Hodson If you're not looking for a submodule, you can just move the tracked files into a subdirectory with 'mv' or through yo

Re: [git-users] Pushing files into a subtree

2012-11-29 Thread Dale R. Worley
> From: Ryan Hodson > > If you're not looking for a submodule, you can just move the tracked files > into a subdirectory with 'mv' or through your file browser. Then run 'git > add .' in the project root and Git will figure out the file renames on its > own. The 'git mv' command can be used to th

Re: [git-users] Pushing files into a subtree

2012-11-29 Thread John McKown
Can't get the web-site to bottom post. Sorry. Thanks Konstantin, that 4th web page was very helpful to me. I thought I'd see how well it works. I have a subdirectory which contains multiple subdirectories. Each subdirectory within the parent is an independent git repository. I thought I'd try t

Re: [git-users] Pushing files into a subtree

2012-11-28 Thread Konstantin Khomoutov
On Wed, Nov 28, 2012 at 02:13:32PM -0500, Dale R. Worley wrote: > I am just beginning to use git. I've read the O'Reilly book (by > Loeliger and McCullough), and (unexpectedly) it didn't give me a clear > view of some of the messier aspects of git. So as a first question, > I'd like to know if a

Re: [git-users] Pushing files into a subtree

2012-11-28 Thread Ryan Hodson
Dale, If you're not looking for a submodule, you can just move the tracked files into a subdirectory with 'mv' or through your file browser. Then run 'git add .' in the project root and Git will figure out the file renames on its own. The 'git mv' command can be used to the same effect. Hope that

Re: [git-users] Pushing files into a subtree

2012-11-28 Thread Brian Kotek
I'm not really sure what you're looking for with your first question, but for the second, it sounds like you want submodules/superproject: http://git-scm.com/book/en/Git-Tools-Submodules On Wed, Nov 28, 2012 at 2:13 PM, Dale R. Worley wrote: > I am just beginning to use git. I've read the O'Re

[git-users] Pushing files into a subtree

2012-11-28 Thread Dale R. Worley
I am just beginning to use git. I've read the O'Reilly book (by Loeliger and McCullough), and (unexpectedly) it didn't give me a clear view of some of the messier aspects of git. So as a first question, I'd like to know if anyone knows of an exposition that gives a clear and accurate description