development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-11-05 18:59:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

git-pull documentation: fix markup

Browse source 
A note paragraph was mistakenly made into an indented monospace display.
Noticed by Miklos Vajna.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2008-02-11 11:22:01 -08:00
parent 7a31cc0f96
commit 473d33168b
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Documentation/git-pull.txt
View file

@ -39,11 +39,11 @@ include::merge-strategies.txt[]
there is a remote ref for the upstream branch, and this branch there is a remote ref for the upstream branch, and this branch
was rebased since last fetched, the rebase uses that information was rebased since last fetched, the rebase uses that information
to avoid rebasing non-local changes. to avoid rebasing non-local changes.
+
*NOTE:* This is a potentially _dangerous_ mode of operation. *NOTE:* This is a potentially _dangerous_ mode of operation.
It rewrites history, which does not bode well when you It rewrites history, which does not bode well when you
published that history already. Do *not* use this option published that history already. Do *not* use this option
unless you have read linkgit:git-rebase[1] carefully. unless you have read linkgit:git-rebase[1] carefully.
\--no-rebase:: \--no-rebase::
Override earlier \--rebase. Override earlier \--rebase.