git-pull documentation: fix markup
A note paragraph was mistakenly made into an indented monospace display. Noticed by Miklos Vajna. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Feb 11, 2008 at 11:22 UTC
473d33168be9b0984f6281d5613f3b7b84817e99
1 file changed
+5
-5
Documentation/git-pull.txt
+5
-5
@@ -39,11 +39,11 @@ include::merge-strategies.txt[]
39
there is a remote ref for the upstream branch, and this branch
40
was rebased since last fetched, the rebase uses that information
41
to avoid rebasing non-local changes.
42
-
43
- *NOTE:* This is a potentially _dangerous_ mode of operation.
44
- It rewrites history, which does not bode well when you
45
- published that history already. Do *not* use this option
46
- unless you have read linkgit:git-rebase[1] carefully.
42
++
43
+*NOTE:* This is a potentially _dangerous_ mode of operation.
44
+It rewrites history, which does not bode well when you
45
+published that history already. Do *not* use this option
46
+unless you have read linkgit:git-rebase[1] carefully.
47
48
\--no-rebase::
49
Override earlier \--rebase.