I would appreciate some help or suggetions on this problem:
A) a "big" repository with long history and a submodule
B) a "small" repo made recently from an export of repo A, except some
files/folders and including the files from the submodule of A
how can I merge new commits (or cherrypick)?
repo A is a project with about 10 years of history (partially imported form
svn) which I want to keep. This repo includes files for different
Recently, I agreed to work on this project with a team of one customer in a
shared git repository. Obviously, they must not be able to see private
files belonging to other customers. And there was no need for them to see
my 10ys of history.
So for a quick start, I just created a new repository with the files to be
used. And to make things simpler (maybe more complicated now) I included
the files from the submodule.
Now I want to link the two repos so that I can merge new commits between
the two repos.
(git remote starts with a "no common history" warning ... so maybe some
merge -s ours magic should be applied ... ? But the difference in
submodules makes me doubt that this will be easy)
To be sure not to import private object into B, merging one way B into A
alone would be a helpful start. Ideally, I would to able to merge both ways.
Is this possible at all? Or should I prepare to juggle with patch files?
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To view this discussion on the web visit
To post to this group, send email to firstname.lastname@example.org.
To unsubscribe from this group, send email to
For more options, visit this group at