Hi all,
we have a repository with essentially this commit graph:
o---o---o---...---o---o---D <-- develop
/ / /
o---o---o---o---...---M <-- master
As shown, we occasionally merge "master" into "develop", but never vice-versa. (We
create our releases o
Surley (?) the simplest method, given your limited number of branches,
is to capture and repeat the moves as a script once for each branch, so
that each branch has a flag day commit. Then the development merging
should proceed just fine.
At least then the file rename machinery has much less to
Hi Philip,
Am 2013-01-06 14:59, schrieb Philip Oakley:
Surley (?) the simplest method, given your limited number of branches, is to
capture and
repeat the moves as a script once for each branch, so that each branch has a
flag day
commit. Then the development merging should proceed just fine.
Aha, I think I see it now...
Your issue [my mistake] is that the (gits's) merge process is a three
way merge, so you have the two commits F and N to merge, but git will
also locate the merge-base at M (which has the old directory structure),
and compares the diffs between them [M-F] and [M-N]
Hi experts
I find my treeA want to have another treeB's dir, I don't want to
clone the whole treeB, I don't know can we do it with git the get
treeB's dir
Lei
--
git send-email -2 --to lei.y...@windriver.com
--subject-prefix=meta-networking][PATCH:V2> works
results: subject is : [meta-networking][PATCH:V2 1/2] Removing README
from libvirt and qemu dirs
but I want [meta-networking][PATCH V2 1/2] Removing README from
libvirt and qemu dirs
git send-
