diff options
Diffstat (limited to 'git-cherry-pick.txt')
| -rw-r--r-- | git-cherry-pick.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-cherry-pick.txt b/git-cherry-pick.txt index 1e8ac9df6..fdcad3d20 100644 --- a/git-cherry-pick.txt +++ b/git-cherry-pick.txt @@ -219,7 +219,7 @@ again, this time exercising more care about matching up context lines. ------------ $ git cherry-pick topic^ <1> $ git diff <2> -$ git reset --merge ORIG_HEAD <3> +$ git cherry-pick --abort <3> $ git cherry-pick -Xpatience topic^ <4> ------------ <1> apply the change that would be shown by `git show topic^`. |