https://github.com/niklasf/git-rebase-patch
Rebase patches that no longer apply to HEAD
https://github.com/niklasf/git-rebase-patch
Last synced: about 1 year ago
JSON representation
Rebase patches that no longer apply to HEAD
- Host: GitHub
- URL: https://github.com/niklasf/git-rebase-patch
- Owner: niklasf
- Created: 2012-02-19T19:44:14.000Z (over 14 years ago)
- Default Branch: master
- Last Pushed: 2014-07-10T10:28:11.000Z (almost 12 years ago)
- Last Synced: 2025-03-26T15:42:43.465Z (about 1 year ago)
- Language: Shell
- Homepage:
- Size: 171 KB
- Stars: 9
- Watchers: 3
- Forks: 1
- Open Issues: 0
-
Metadata Files:
- Readme: README.md
Awesome Lists containing this project
README
git rebase-patch
================
**This tool has been merged into https://github.com/visionmedia/git-extras.
Future improvements and bug fixes will be found only there.**
Given you have a patch that doesn't apply to the current HEAD, but you know it
applied to some commit in the past, `git rebase-patch` will help you find that
commit and do a rebase.
Usage: `git rebase-patch `
(Note: If the patch has been created with `git format-patch`, it is better and
more efficient to use `git am`, because that considers meta information from the
patch.)
Example
-------
You can reroll a patch against the current HEAD like this:
git rebase-patch old-patch.patch
That might give you:
Trying to find a commit the patch applies to...
Patch applied to 9d1a78c as 9e22d99
[master 4d28217] remove-second-paragraph.patch
1 file changed, 2 deletions(-)
Now your latest commit has the changes of your patch. It's message is the patch
file name. Then proceed as usual.
Reroll the patch:
git diff HEAD~1 > new-patch.patch
Change the commit message:
git commit --amend