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
When other guys had already given some answer which comply with git convention, the OP’s question, “create a patch without commit”, can be also solved in this way: git diff > my_patch.txt Later you can apply this patch, also without a commit, by: git apply my_patch.txt But if you are just working locally, a git … Read more
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 without git too) But finding the right “creation commit” of a branch can be complex: see “Finding a … Read more
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
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 programmers tend to care about. As the manual explains: What are considered whitespace errors is controlled by core.whitespace configuration. By default, trailing whitespaces (including lines that solely consist of whitespaces) … Read more
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
You can see in this blog post how you can create a patch (collection of changes you want to communicate and apply to another repo) (picture from the 2008 blog post “Bioruby with git: how would that work?”, published by Jan AERTS) See also Contributing to Rails with Git as another concrete example. Nowadays, the … Read more
Sure, git stash show supports this: git stash show -p So, use git stash list to find out the number of the stash that you want to export as a patch, then git stash show -p stash@{<number>} > <name>.patch to export it. For example: git stash show -p stash@{3} > third_stash.patch
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
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