diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-02-11 11:22:01 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-02-11 11:22:01 -0800 |
| commit | 473d33168be9b0984f6281d5613f3b7b84817e99 (patch) | |
| tree | 229c4a7bcc73e1602bac5756468841cf29003aba | |
| parent | config: Fix --unset for continuation lines (diff) | |
| download | tgif-473d33168be9b0984f6281d5613f3b7b84817e99.tar.xz | |
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>
| -rw-r--r-- | Documentation/git-pull.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index 4cc633a5ec..179bdfc69d 100644 --- a/Documentation/git-pull.txt +++ b/Documentation/git-pull.txt @@ -39,11 +39,11 @@ include::merge-strategies.txt[] 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. |