login
Header Space

 
 

how to use git merge -s subtree?

Score:
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: <git@...>
Date: Saturday, January 5, 2008 - 7:00 pm

hi,

i recently noticed that the subtree merge strategy is missing from
merge-strategies.txt an i tried to first figure out how it works. i got
it to work, but i'm not 100% sure about i'm using it the way i'm
supposed to.

here is what i do:

1) git remote add B /path/to/B.git
2) git fetch
3) mkdir B
4) touch B/.gitignore
5) git add B/.gitignore
6) git commit -m "add empty B directory"
7) git merge -s subtree B/master

and yes, it works pretty well, but is this the right way? or is it
possible to somehow avoid steps 3..6?

thanks,
- VMiklos
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
how to use git merge -s subtree?, Miklos Vajna, (Sat Jan 5, 7:00 pm)
Re: how to use git merge -s subtree?, David Soria Parra, (Sat Jan 5, 9:20 pm)
Re: how to use git merge -s subtree?, Sean, (Sat Jan 5, 9:17 pm)
Re: how to use git merge -s subtree?, Miklos Vajna, (Sat Jan 5, 11:45 pm)
Re: how to use git merge -s subtree?, David Soria Parra, (Sat Jan 5, 9:22 pm)
Re: how to use git merge -s subtree?, Sean, (Sat Jan 5, 10:13 pm)
Re: how to use git merge -s subtree?, David Soria Parra, (Sat Jan 5, 10:28 pm)
Re: how to use git merge -s subtree?, Junio C Hamano, (Sat Jan 5, 10:42 pm)
Re: how to use git merge -s subtree?, Sean, (Sun Jan 6, 4:06 am)
Re: how to use git merge -s subtree?, Junio C Hamano, (Mon Jan 7, 5:04 pm)
Re: how to use git merge -s subtree?, Sean, (Tue Jan 8, 1:34 am)
Re: how to use git merge -s subtree?, Junio C Hamano, (Tue Jan 8, 2:57 am)
speck-geostationary