Re: [git-users] moving a directory from one repo to another with commit history

2015-05-26 Thread Kalpa Welivitigoda
On Tue, May 26, 2015 at 11:37 PM, Konstantin Khomoutov wrote: > On Tue, 26 May 2015 22:24:25 +0530 > Kalpa Welivitigoda wrote: > > [...] >> >> Thanks for all the support rendered. I tried the above method and >> >> it places the directory from repoB to the co

Re: [git-users] moving a directory from one repo to another with commit history

2015-05-26 Thread Kalpa Welivitigoda
On Mon, May 25, 2015 at 5:30 PM, Konstantin Khomoutov wrote: > On Sat, 23 May 2015 23:02:46 +0530 > Kalpa Welivitigoda wrote: > > [...] >> >> Use the `git subtree` command [*]. >> > [...] >> > >> > To elaborate, a pseudocode (assuming a POSIX s

Re: [git-users] moving a directory from one repo to another with commit history

2015-05-23 Thread Kalpa Welivitigoda
git merge -s ours --no-commit Bdir12 > $ git read-tree --prefix dir1/dir1-2 -u Bdir12 > $ git commit --edit Thanks for all the support rendered. I tried the above method and it places the directory from repoB to the correct place on repoA. But if I log the commits for dir1-2 in repo

[git-users] moving a directory from one repo to another with commit history

2015-05-22 Thread Kalpa Welivitigoda
Hi, My question is basically moving a directory from one git repo to another with the commit history for that directory. Let me elaborate more. Say we have two git repositories repoA and repoB with the following directory structure repoA --dir1 -- dir1-1 -- dir1-3 --dir2 repoB --di