The apply-patch-to-file script allows you to apply a Git patch to files with the same content but different name or file path without having to manually modify the patch itself.
Use with the following syntax:
apply-patch-to-file [-i] <patch>
[-f <file_to_patch>] <patch>
[-h]
Not specifying any options defaults to interactive mode.
- -f file_to_patch — allows you to specify a single file that will be patched. This means that the specified patch must only modify one file.
- -i — starts your favorite editor with a pre-formatted table in which you specify target files that will be patched.
- -h — displays usage information.
-
Create a patch of, for example, the HEAD commit in your Git repository:
repo1]$ git format-patch HEAD^ -
Switch to a different repository in which you'd like to apply the patch to a file or files of your choosing, and run apply-patch-to-file script, specifying the previously-created patch as an argument:
repo2]$ apply-patch-to-file -i ~/patches/0001-my-test-commit.patch -
In your editor, specify the target files where the patch should apply:
File Specified in Patch Target File ----------------------- ----------- test/blue.xml test/red.xml images/hello.sh test/images/hi.sh -
Save and exit you editor. In case of no conflicts, check git log to see your patch applied.
apply-patch-to-file — . Copyright (C) 2012 Martin Prpič
This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/.