Thread (7 messages) flat view 7 messages, 3 authors, 2016-06-15

how to use git merge -s subtree?

From: Miklos Vajna <hidden>
Date: 2016-06-15 22:44:02

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

Attachments

Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help