diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-03-23 14:32:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-23 14:32:46 -0700 |
| commit | 322c6244651c408d924f71f73effd8ed833916d3 (patch) | |
| tree | 6e8cf8d283e2a923cc330b4b64eeb3c972341edd /git-pull.txt | |
| parent | 0762262193bb8a218def4fd749a68476d5337b5d (diff) | |
| download | git-htmldocs-322c6244651c408d924f71f73effd8ed833916d3.tar.gz | |
Autogenerated HTML docs for v2.3.4-263-gf53fc
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 200eb2226..d3d236cd1 100644 --- a/git-pull.txt +++ b/git-pull.txt @@ -117,7 +117,7 @@ locally created merge commits will not be flattened. + When false, merge the current branch into the upstream branch. + -See `pull.rebase`, `branch.<name>.rebase` and `branch.autosetuprebase` in +See `pull.rebase`, `branch.<name>.rebase` and `branch.autoSetupRebase` in linkgit:git-config[1] if you want to make `git pull` always use `--rebase` instead of merging. + |