Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Documentation/git-pull.txt: Use more standard [NOTE] markup
author
Junio C Hamano
<gitster@pobox.com>
Thu, 12 Jun 2008 21:19:09 +0000
(14:19 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Thu, 12 Jun 2008 21:19:09 +0000
(14:19 -0700)
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>
Documentation/git-pull.txt
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
97fc865
)
diff --git
a/Documentation/git-pull.txt
b/Documentation/git-pull.txt
index 5f55f6494a1a66daf8ba77d8a1f709ca9dc55103..d0f1595f7e9051b5d58d1dba030ea3a7d80bdab5 100644
(file)
--- 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.