diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-05-02 13:51:45 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-02 13:51:45 -0700 |
| commit | d274fc093cbdcddbf9aff5f79de4e9445f3363d7 (patch) | |
| tree | 0abf168a8760bee8686a8836b4b29a366eab0118 /Documentation/git-pull.txt | |
| parent | 1be65eda6a7018445ebdd9cfec4b1caab4db34ba (diff) | |
| parent | 6cf378f0cbe7c7f944637892caeb9058c90a185a (diff) | |
| download | git-d274fc093cbdcddbf9aff5f79de4e9445f3363d7.tar.xz | |
Merge branch 'jk/doc-asciidoc-inline-literal'
Our documentation was written for an ancient version of AsciiDoc,
making the source not very readable.
By Jeff King
* jk/doc-asciidoc-inline-literal:
docs: stop using asciidoc no-inline-literal
Diffstat (limited to 'Documentation/git-pull.txt')
| -rw-r--r-- | Documentation/git-pull.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index 0f18ec891a..defb544ed0 100644 --- a/Documentation/git-pull.txt +++ b/Documentation/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. |