diff options
Diffstat (limited to 'Documentation/gitcore-tutorial.txt')
| -rw-r--r-- | Documentation/gitcore-tutorial.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/gitcore-tutorial.txt b/Documentation/gitcore-tutorial.txt index dd6a26827f..a2b92933f7 100644 --- a/Documentation/gitcore-tutorial.txt +++ b/Documentation/gitcore-tutorial.txt @@ -1655,7 +1655,7 @@ branch before these two merges by resetting it to 'master~2': $ git reset --hard master~2 ------------ -You can make sure 'git show-branch' matches the state before +You can make sure `git show-branch` matches the state before those two 'git-merge' you just did. Then, instead of running two 'git-merge' commands in a row, you would merge these two branch heads (this is known as 'making an Octopus'): |