git-am

I am trying to port a shell script to Java which contains a few Git commands which I have mostly managed to find in the JGit API. I have not, however, managed to find the remote or am commands, is this because the don't exist or I am just looking in the wrong place for them. If they don't exist is there another way to use them? There is no ready-to run counterpart for git remote and am in JGit, but it should be possible to implement (a subset of) them with reasonable effort. Those sub-commands of git remote that query or manipulate the config file can be emulated by directly accessing the

I am on windows. For various reasons we have multiple git instances of different svn branches. Many times I want to fix an issue in repository A, generate a patch, and apply it to repository B. This works fine except if there are conflicts. When rebasing I just right click the folder and use tortioseGit and select the resolve option. This brings up a nice gui to let me work through my conflicts. Is there any way to accomplish this with rejected patch chunks? Here is my current approach to creating/applying the patches git format-patch master --stdout > c:\\patch\\file.patch git apply --reject

I sometimes need to cherry-pick a tag with a certain fix into my branch, and used to do so via git cherry-pick tags/myfix This works, but cherry-picking takes an increasingly long time doing "inexact rename detection". My hunch was that this could be faster with git format-patch -k -1 --stdout tags/myfix | git am -3 -k In fact, this turned out to apply the fix instantly, leaving my branch in exactly the same state as cherry-picking. Now my question is, what exactly does cherry-picking do differently? I thought cherry-picking was basically implemented as exactly this, but I must have been

I have two repositories. In one, I make changes to file ./hello.test . I commit the changes and create a patch from that commit with git format-patch -1 HEAD . Now, I have a second repository that contains a file that has the same contents as hello.test but is placed in a different directory under a different name: ./blue/red/hi.test . How do I go about applying the aforementioned patch to the hi.test file? I tried git am --directory='blue/red' < patch_file but that of course complains that the files are not named the same (which I thought Git didn't care about?). I know I could probably edit