1GIT-REBASE-PATCH(1) Git Extras GIT-REBASE-PATCH(1)
2
3
4
6 git-rebase-patch - Rebases a patch
7
9 git-rebase-patch <patch-file>
10
12 Given you have a patch that doesn´t apply to the current HEAD, but you
13 know it applied to some commit in the past, git-rebase-patch will help
14 you find that commit and do a rebase.
15
17 <patch-file>
18 The patch to be applied.
19
21 Executing
22
23
24
25 $ git rebase-patch test.patch
26
27
28
29 could give you something like that:
30
31
32
33 Trying to find a commit the patch applies to...
34 Patch applied to dbcf408dd26 as 7dc8b23ae1a
35 First, rewinding head to replay your work on top of it...
36 Applying: test.patch
37 Using index info to reconstruct a base tree...
38 Falling back to patching base and 3-way merge...
39 Auto-merging README.txt
40
41
42
43 Then your last commit has the changes of the patch and is named
44 test.patch.
45
47 Written by Niklas Fiekas <niklas.fiekas@tu-clausthal.de>
48
50 <http://github.com/tj/git-extras/issues>
51
53 <http://github.com/tj/git-extras>
54
55
56
57 October 2017 GIT-REBASE-PATCH(1)