diff options
author | Junio C Hamano <gitster@pobox.com> | 2008-02-11 21:23:06 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-02-11 21:23:06 (GMT) |
commit | 04f32cf1b31717bf0b7cbbc00783a4107cc19cfd (patch) | |
tree | faa82765b851e6f0cabfe37e4936d5ca1bf623ec /Documentation/git-pull.txt | |
parent | 94bf9f7c37cca0241785a5f4e54e5cc98e175244 (diff) | |
parent | 6c47d0e8f3983cff5bf633cb8e6f7ecfecf48db7 (diff) | |
download | git-04f32cf1b31717bf0b7cbbc00783a4107cc19cfd.zip git-04f32cf1b31717bf0b7cbbc00783a4107cc19cfd.tar.gz git-04f32cf1b31717bf0b7cbbc00783a4107cc19cfd.tar.bz2 |
Merge branch 'maint'
* maint: (35 commits)
config.c: guard config parser from value=NULL
builtin-log.c: guard config parser from value=NULL
imap-send.c: guard config parser from value=NULL
wt-status.c: guard config parser from value=NULL
setup.c: guard config parser from value=NULL
remote.c: guard config parser from value=NULL
merge-recursive.c: guard config parser from value=NULL
http.c: guard config parser from value=NULL
help.c: guard config parser from value=NULL
git.c: guard config parser from value=NULL
diff.c: guard config parser from value=NULL
convert.c: guard config parser from value=NULL
connect.c: guard config parser from value=NULL
builtin-tag.c: guard config parser from value=NULL
builtin-show-branch.c: guard config parser from value=NULL
builtin-reflog.c: guard config parser from value=NULL
builtin-log.c: guard config parser from value=NULL
builtin-config.c: guard config parser from value=NULL
builtin-commit.c: guard config parser from value=NULL
builtin-branch.c: guard config parser from value=NULL
...
Diffstat (limited to 'Documentation/git-pull.txt')
-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 4cc633a..179bdfc 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. |