How to manage several similar but different projects using git?

Question

I have several closed source projects based on a similar code base, and every day I need to copy changes and corrections from one to another and back.

Since some of my projects diverge too much using the git submodules, and in other cases I don’t want my clients to get confused with the submodules and, therefore, look into my work on other projects, now I do this with the git patch and git apply This is a tedious job.

I am going to consider switching to git pull and git push between local repositories on my computer and therefore using git cherry-pick and git merge to get the necessary changes, but if there is a better way?

Answer 1

Using git cherry-pick can do what you want. Having another repository as remote, from which you can extract, you can still select individual commits. You also do not need to create a remote control branch, just select in the changes and cherries select the sha1 command that you want to transfer. When you click, it should not push other extracted links, since they are not in your current branch, but only the selected cherry.

Answer 2

The following offers are more like offers

Subtitle Merge

Staple Repositories

I am also very interested, and I will come with an update if I find a final answer.