summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7a31cc0)
raw | patch | inline | side by side (parent: 7a31cc0)
author | Junio C Hamano <gitster@pobox.com> | |
Mon, 11 Feb 2008 19:22:01 +0000 (11:22 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Mon, 11 Feb 2008 19:22:01 +0000 (11:22 -0800) |
A note paragraph was mistakenly made into an indented monospace display.
Noticed by Miklos Vajna.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Noticed by Miklos Vajna.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-pull.txt | patch | blob | history |
index 4cc633a5ec4c449e98ac9cb16fd125da6d336798..179bdfc69ddfeff9d272ec309721e4098f3b051e 100644 (file)
there is a remote ref for the upstream branch, and this branch
was rebased since last fetched, the rebase uses that information
to avoid rebasing non-local changes.
-
- *NOTE:* This is a potentially _dangerous_ mode of operation.
- It rewrites history, which does not bode well when you
- published that history already. Do *not* use this option
- unless you have read linkgit:git-rebase[1] carefully.
++
+*NOTE:* This is a potentially _dangerous_ mode of operation.
+It rewrites history, which does not bode well when you
+published that history already. Do *not* use this option
+unless you have read linkgit:git-rebase[1] carefully.
\--no-rebase::
Override earlier \--rebase.