Hi,
On 9 September 2012 09:36, Andreas Schwab [off-list ref] wrote:
Add "bsd" as a remote in "portable" and cherry-pick each commit in
"bsd".
I am already kind of doing this at the moment. Hence:
1. In portable, I have:
% git remote add bsd /path/to/bsd/repo
% git fetch bsd
2. At this point I scan the two branches looking for a point to
graft; I might have done this already in the past, but the point is
since grafting is a local operation and I am not working in that
repository, I might need to do it again anyway -- that graft
represents a way of tieing the branches together at a point I can then
"git merge".
Kindly,
David