You could create the patch using git diff and then apply it using the patch utility, which allows you to specify the file you want to apply the diff to. For example: cd first-repo git diff HEAD^ — hello.test > ~/patch_file cd ../second-repo patch -p1 blue/red/hi.test ~/patch_file
If manually editing the patch file is out of the question or infeasible, this can be done with standard options (available in git apply, git format-patch and GNU patch). -p<n> removes n leading directories from the paths in the patch. After processing -p, –directory=<root> prepends root to each of the paths in the patch before … Read more
If you haven’t yet commited the changes, then: git diff > mypatch.patch But sometimes it happens that part of the stuff you’re doing are new files that are untracked and won’t be in your git diff output. So, one way to do a patch is to stage everything for a new commit (git add each … Read more
git apply –reject –whitespace=fix mychanges.patch worked for me. Explanation The –reject option will instruct git to not fail if it cannot determine how to apply a patch, but instead to apply the individual hunks it can apply and create reject files (.rej) for hunks it cannot apply. Wiggle can “apply [these] rejected patches and perform … Read more
I had the exact same problem as mentioned by you above. But I found this clearer in explaining the answer. Summary: Check out the path(s) from the branch you want to merge, $ git checkout source_branch — <paths>… Hint: It also works without `–` like seen in the linked post. or to selectively merge hunks … Read more