git-patch

How can I generate patch for all commits in a given branch by knowing only the branch name? This step is part of a complex workflow all of which is being automated. Hence requiring someone to manually determine the first commit in the branch is not an option. Note that anything relying on reflog is not an option either because changes in the branch are not made locally. VonC If you know from which branch your "given branch" has been created, then making a patch is easy : git diff master Branch1 > ../patchfile git checkout Branch2 git apply ../patchfile (and you can generate a patch applicable

I'm editing some markdown files of a cloned remote repository, and wanted to test creating and applying patches from one branch to another. However, every time I make any change at all, I get the following message during git apply : 0001-b.patch:16: trailing whitespace. warning: 1 line adds whitespace errors. (This is happening on my Mac, and I don't know where the original code was created.) What does the warning message mean, and do I need to care? You don't need to care. The warning enacts a standard of cleanliness of text files in regard to whitespace, the kind of thing that many

In git, I stash away my changes. Is it possible that I can create a patch with what I stash away? And the apply that patch in some other repository (my co-worker's)? I know 'git format-patch -1' but I think that is for what I have committed. But I am looking for the same thing for changes I stashed away? And how can I apply a patch in other repository? Greg Hewgill Sure, git stash show supports this: git stash show -p This answer provides info about both saving the patch and applying it where you want to use it. To stash the output in a file: git stash show -p --color=never > my-patch-name

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

I have two repositories, one is the main repo for a library, and the other is a project using that library. If I make a fix to the in the subservient project, I'd like an easy way to apply that patch back upstream. The file's location is different in each repository. Main repo: www.playdar.org/static/playdar.js Project: playlick.com/lib/playdar.js I tried using git format-patch -- lib/playdar.js on the playlick project, and then git am on the main playdar repo, but the differing file locations in the patch file raised an error. Is there an easy way to apply the patch from a given commit on a