utils-code/tj.git-extras
1
0
Fork 0
mirror of https://github.com/tj/git-extras.git synced 2026-09-10 15:36:21 -04:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix so 'git rebase-patch' is described once.

Browse source
This commit is contained in:
Edward Betts 2017-11-26 06:31:22 +00:00
parent 6aecc2b9fa
commit fc8eaf0d28
1 changed files with 1 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Commands.md
View file

@ -1166,22 +1166,6 @@ $ git missing master
> 97ef387 only on master
```
## git rebase-patch
Given a patch that doesn't apply to the current HEAD, find the latest commit
it applies to and do a rebase. For example:
```bash
$ git rebase-patch test.patch
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
```
## git lock
Lock a local file `filename`:
@ -1365,7 +1349,7 @@ Create pull request via commandline.
## git rebase-patch
Given you have a patch that doesn´t apply to the current HEAD, but you know it applied to some commit in the past,
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.
For example,