diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-06-12 14:19:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-06-12 14:19:09 -0700 |
| commit | 6bfa3c99292dad8f88b2c8ac22e557421d57fd46 (patch) | |
| tree | 307786d516312d73fbe02f7efdf5c2dc26d8d501 /Documentation | |
| parent | 97fc865bc1cd8aa23ed36c4c53e211e4d0c99626 (diff) | |
| download | git-6bfa3c99292dad8f88b2c8ac22e557421d57fd46.tar.gz git-6bfa3c99292dad8f88b2c8ac22e557421d57fd46.tar.xz | |
Documentation/git-pull.txt: Use more standard [NOTE] markup
Unlike other manual pages (e.g. git-blame.txt), this used *NOTE:*
to show a side note headed with boldface string "NOTE". Use a paragraph
headed by [NOTE] like others instead.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-pull.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index 5f55f6494..d0f1595f7 100644 --- a/Documentation/git-pull.txt +++ b/Documentation/git-pull.txt @@ -38,7 +38,8 @@ include::merge-options.txt[] for branch `<name>`, set configuration `branch.<name>.rebase` to `true`. + -*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 published that history already. Do *not* use this option unless you have read linkgit:git-rebase[1] carefully. |