Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
docs: typo: s/isimilar/similar/
author
Michael Witten
<mfwitten@gmail.com>
Sat, 6 Oct 2018 04:20:22 +0000
(
04:20
+0000)
committer
Junio C Hamano
<gitster@pobox.com>
Sun, 7 Oct 2018 01:11:02 +0000
(10:11 +0900)
Signed-off-by: Michael Witten <mfwitten@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-rebase.txt
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
634dbd0
)
diff --git
a/Documentation/git-rebase.txt
b/Documentation/git-rebase.txt
index 1fbc6ebcde0945fe6bc8cc85e5fd31247c4879e4..432baabe33e50d5e6f582aea8a9dee1e6de58fc8 100644
(file)
--- 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
to proceed.
The `reset` command resets the HEAD, index and worktree to the specified
-revision. It is
i
similar 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
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