diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2008-02-12 03:18:52 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2008-02-12 03:18:52 +0000 |
| commit | 9c33415fc305e37bd5a1f399bae1c3b9e2559571 (patch) | |
| tree | d062fd43e7c3a543176e5d390ac730c6b2a99b5c /git-pull.txt | |
| parent | 49dccafcce2c8a846416d30bc7cac6a72d67c102 (diff) | |
| download | git-htmldocs-9c33415fc305e37bd5a1f399bae1c3b9e2559571.tar.gz | |
Autogenerated HTML docs for v1.5.4.1-97-g40aab
Diffstat (limited to 'git-pull.txt')
| -rw-r--r-- | git-pull.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/git-pull.txt b/git-pull.txt index 4cc633a5e..179bdfc69 100644 --- a/git-pull.txt +++ b/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. |