File: git-rebase-patch.md

package info (click to toggle)
git-extras 7.4.0-1
  • links: PTS
  • area: main
  • in suites: forky, sid
  • size: 2,120 kB
  • sloc: sh: 4,312; python: 994; makefile: 146
file content (47 lines) | stat: -rw-r--r-- 1,095 bytes parent folder | download | duplicates (4) 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
 
git-rebase-patch(1) -- Rebases a patch
================================

## SYNOPSIS

`git-rebase-patch` <patch-file>

## DESCRIPTION

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.

## OPTIONS

  * <patch-file>:
     The patch to be applied.

## EXAMPLES

  Executing

    $ git rebase-patch test.patch

  could give you something like that:

    Trying to find a commit the patch applies to...
    Patch applied to dbcf408dd26 as 7dc8b23ae1a
    First, rewinding head to replay your work on top of it...
    Applying: test.patch
    Using index info to reconstruct a base tree...
    Falling back to patching base and 3-way merge...
    Auto-merging README.txt

  Then your last commit has the changes of the patch and is named *test.patch*.

## AUTHOR

Written by Niklas Fiekas &lt;<niklas.fiekas@tu-clausthal.de>&gt;

## REPORTING BUGS

&lt;<https://github.com/tj/git-extras/issues>&gt;

## SEE ALSO

&lt;<https://github.com/tj/git-extras>&gt;