This is a classic case of rebase –onto: # let’s go to current master (X, where quickfix2 should begin) git checkout master # replay every commit *after* quickfix1 up to quickfix2 HEAD. git rebase –onto master quickfix1 quickfix2 So you should go from o-o-X (master HEAD) \ q1a–q1b (quickfix1 HEAD) \ q2a–q2b (quickfix2 HEAD) to: … 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
Try: git format-patch -1 <sha> or git format-patch -1 HEAD According to the documentation link above, the -1 flag tells Git how many commits should be included in the patch; -<n> Prepare patches from the topmost commits. Apply the patch with the command: git am < file.patch