summaryrefslogtreecommitdiffstats
path: root/git-pull.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2008-06-13 10:04:01 +0000
committerJunio C Hamano <junio@hera.kernel.org>2008-06-13 10:04:01 +0000
commit6fb124cd538ba3d8d7c5da9bb979b3fd0e1b2925 (patch)
tree42399be6b1d4ba93c664dd7a38942975da9d06f7 /git-pull.txt
parentdc8f25ba925d69ae6cd9477948a4681a6b9ba881 (diff)
downloadgit-htmldocs-6fb124cd538ba3d8d7c5da9bb979b3fd0e1b2925.tar.gz
Autogenerated HTML docs for v1.5.6-rc2-45-gdc92c
Diffstat (limited to 'git-pull.txt')
-rw-r--r--git-pull.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/git-pull.txt b/git-pull.txt
index 5f55f6494..d0f1595f7 100644
--- a/git-pull.txt
+++ b/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.