diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-10-16 16:16:09 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-10-16 16:16:09 +0900 |
| commit | 65f1b1bd9f88e041ba21e9c0230be5ba44962b5d (patch) | |
| tree | 7295080d6df931bd244c70838fd1cc8df61dfc66 /Documentation/git-rebase.txt | |
| parent | Merge branch 'js/mingw-wants-vista-or-above' (diff) | |
| parent | docs: typo: s/isimilar/similar/ (diff) | |
| download | tgif-65f1b1bd9f88e041ba21e9c0230be5ba44962b5d.tar.xz | |
Merge branch 'mw/doc-typofixes'
Typofixes.
* mw/doc-typofixes:
docs: typo: s/isimilar/similar/
docs: graph: remove unnecessary `graph_update()' call
docs: typo: s/go/to/
Diffstat (limited to 'Documentation/git-rebase.txt')
| -rw-r--r-- | Documentation/git-rebase.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 1fbc6ebcde..432baabe33 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -954,7 +954,7 @@ command fails, it is rescheduled immediately, with a helpful message how to proceed. The `reset` command resets the HEAD, index and worktree to the specified -revision. It is isimilar to an `exec git reset --hard <label>`, but +revision. It is similar to an `exec git reset --hard <label>`, but refuses to overwrite untracked files. If the `reset` command fails, it is rescheduled immediately, with a helpful message how to edit the todo list (this typically happens when a `reset` command was inserted into the todo |