diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-05-02 15:02:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-02 15:02:46 -0700 |
| commit | b76a68630eaab75c4eb1c41f0fc091811854ff43 (patch) | |
| tree | 5be60264e80970f60d9c56b410c8828693be8588 /git-pull.txt | |
| parent | 0aadbc37c068365a09926cd895863c4a725b45d6 (diff) | |
| download | git-htmldocs-b76a68630eaab75c4eb1c41f0fc091811854ff43.tar.gz | |
Autogenerated HTML docs for v1.7.10.1-433-g34875
Diffstat (limited to 'git-pull.txt')
| -rw-r--r-- | git-pull.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-pull.txt b/git-pull.txt index 0f18ec891..defb544ed 100644 --- a/git-pull.txt +++ b/git-pull.txt @@ -110,7 +110,7 @@ include::merge-options.txt[] + See `pull.rebase`, `branch.<name>.rebase` and `branch.autosetuprebase` in linkgit:git-config[1] if you want to make `git pull` always use -`{litdd}rebase` instead of merging. +`--rebase` instead of merging. + [NOTE] This is a potentially _dangerous_ mode of operation. |