I have two sepearate git repos: A and B. Some repository B files are already present in a subfolder of project A. My goal is to create patches for repo B and then applying them to the subfolder wit...

I have a reason¹ to create my git commits as patch files using git-format-patch with the --no-prefix option. This option changes the patch output to not add the git-diff-specific prefixes a/ / b/ ...

I have a patch that gives out the following output when I try to apply it with git am Checking patch old/filename... error: old/filename: does not exist in index Within the patch old/filename is...

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....

When running git-am to apply a patch series I had saved into an mbox file from a mailing list, if the mbox also contains the cover letter (otherwise known as PATCH [0/N]), it complains as follows: ...

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 co...

git mergetool is wonderful (in my case, I use kdiff3). However, it is not possible to use it to resolve conflicts from git am or git apply (or even with patch command). Indeed, mergetool need 3 fil...

I wanted to cherry pick multiple commits from one repository to another. I followed the instructions provided from this Stack Overflow post: /path/to/2 $ git --git-dir=/path/to/1/.git format-patc...

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 "in...

I have a commit with message like [Hello World]Something. Then I use git format-patch HEAD~1 to crate a patch. Content of patch like this: Subject: [PATCH 1/7] [Hello World] Something. But after...

I have two rooms in which I maintain some source code using git, a "dev" room where most development happens and a "deploy" room in which we actually use the software. Inevitably some changes happe...

running git am I get error above. Comparing by hand I do not see any problem. May someone point me where the error is? $ git am 0012-Do-not-die-when-something-nasty-happen-in-the-comman.patch --re...

I tried to apply a patch using git am <my.patch, but it failed. Now I'm getting this in Git Bash: sashoalm@SASHOALM-PC /c/Workspace/MyProject (master|AM 1/1) My prompt used to show: sashoal...

Problem: You want to test a feature someone has developed, but it only exists in a remote branch which is woefully out of date. Source How does cherry-pick solve the problem? Why won't I use...