From fc8eaf0d287458e2158e1d9b41a464f1806fa425 Mon Sep 17 00:00:00 2001 From: Edward Betts Date: Sun, 26 Nov 2017 06:31:22 +0000 Subject: [PATCH] Fix so 'git rebase-patch' is described once. --- Commands.md | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/Commands.md b/Commands.md index f84ad5a..64e6791 100644 --- a/Commands.md +++ b/Commands.md @@ -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,