[git-users] Re: git help about git merge to a specific dir and keep the commit log

2012-12-10 Thread John McKown
I think this is similar to what I gave to a post a couple of days ago. You might try the following on your local machine. I will show the commands that I would enter in a Linux BASH shell. I don't do Windows or MacOSX, but you seem to be on Ubuntu.. First, I would clone the B repository into a

[git-users] Re: git help about git merge to a specific dir and keep the commit log

2012-12-10 Thread John McKown
possible mini bug, instead of: git mv * kvm use git mv \* kvm The \ in front of the * tells git to expand the file names instead of having the shell do it. My mistake. On Monday, December 10, 2012 2:35:58 AM UTC-6, lei yang wrote: Hi experts, I have two tree A and B, A:

Re: [git-users] git help about git merge to a specific dir and keep the commit log

2012-12-10 Thread Konstantin Khomoutov
On Mon, 10 Dec 2012 16:35:58 +0800 lei yang yanglei.f...@gmail.com wrote: I have two tree A and B, A: git://github.com/lei/A.git B: git://github.com/lei/B.git B is like [lyang0@ubuntu B]$ ls benchmark box-opening kvm I want merge A tree to B, 1) put A's content to the kvm directory

Re: [git-users] Digest for git-users@googlegroups.com - 4 Messages in 1 Topic

2012-12-10 Thread King Jin
git submodule might be the one you are looking for. $git clone git://github.com/lei/B.git B $cd B $git submodule add git://github.com/lei/A.git kvm $git submodule update anyone else cloned your repo B, just run `git submodule update` (exclude `) will get the commit history of repo A by changing

Re: [git-users] Digest for git-users@googlegroups.com - 4 Messages in 1 Topic

2012-12-10 Thread lei yang
On Tue, Dec 11, 2012 at 10:02 AM, King Jin jinking.t...@gmail.com wrote: git submodule might be the one you are looking for. $git clone git://github.com/lei/B.git B $cd B $git submodule add git://github.com/lei/A.git kvm $git submodule update Thanks it works for me, and if I do a 'git

Re: [git-users] Re: git help about git merge to a specific dir and keep the commit log

2012-12-10 Thread lei yang
Thanks it works for me, It maybe mv kvm: itself to kvm dir, anyway you instruction perform well for me thanks again and I will try git mv \* kvm Lei On Tue, Dec 11, 2012 at 12:12 AM, John McKown john.archie.mck...@gmail.com wrote: possible mini bug, instead of: git mv * kvm use git mv \*

Re: [git-users] Digest for git-users@googlegroups.com - 4 Messages in 1 Topic

2012-12-10 Thread William Mizuta
You need to realize a git submodule update to update your kvm part. Remember that you need to push your kvm project change and your main project. You can check this site ( http://git-scm.com/book/en/Git-Tools-Submodules ) for more information about git submodule. William Seiti Mizuta

Re: [git-users] Digest for git-users@googlegroups.com - 4 Messages in 1 Topic

2012-12-10 Thread William Mizuta
What do you get when you use git submodule update? William Seiti Mizuta @williammizuta Desenvolvedor da Caelum On Tue, Dec 11, 2012 at 1:22 AM, lei yang yanglei.f...@gmail.com wrote: On Tue, Dec 11, 2012 at 11:00 AM, lei yang yanglei.f...@gmail.com wrote: On Tue, Dec 11, 2012 at 10:02 AM,

[git-users] ls it possible to change the commit info

2012-12-10 Thread lei yang
HI experts my git log is something like #git log commit a83052d1f102341bb5931955658266882d7b8953 Author: Lei Yang yanglei.f...@gmail.com Date: Tue Dec 11 13:36:45 2012 +0800 add testfileA2.add commit