diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-12-09 13:37:01 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-09 13:37:01 -0800 |
| commit | 1ee740e66975adbab080301ebd364e253be3d513 (patch) | |
| tree | 672932e73881b55204ec237b9047c8532d891a61 /Documentation | |
| parent | Merge branch 'rs/allocate-cache-entry-individually' (diff) | |
| parent | pull: introduce a pull.rebase option to enable --rebase (diff) | |
| download | tgif-1ee740e66975adbab080301ebd364e253be3d513.tar.xz | |
Merge branch 'ab/pull-rebase-config'
* ab/pull-rebase-config:
pull: introduce a pull.rebase option to enable --rebase
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 20 | ||||
| -rw-r--r-- | Documentation/git-pull.txt | 2 |
2 files changed, 17 insertions, 5 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 5a841da6d4..8a7d2d4cb1 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -677,10 +677,12 @@ branch.<name>.mergeoptions:: branch.<name>.rebase:: When true, rebase the branch <name> on top of the fetched branch, instead of merging the default branch from the default remote when - "git pull" is run. - *NOTE*: this is a possibly dangerous operation; do *not* use - it unless you understand the implications (see linkgit:git-rebase[1] - for details). + "git pull" is run. See "pull.rebase" for doing this in a non + branch-specific manner. ++ +*NOTE*: this is a possibly dangerous operation; do *not* use +it unless you understand the implications (see linkgit:git-rebase[1] +for details). browser.<tool>.cmd:: Specify the command to invoke the specified browser. The @@ -1590,6 +1592,16 @@ pretty.<name>:: Note that an alias with the same name as a built-in format will be silently ignored. +pull.rebase:: + When true, rebase branches on top of the fetched branch, instead + of merging the default branch from the default remote when "git + pull" is run. See "branch.<name>.rebase" for setting this on a + per-branch basis. ++ +*NOTE*: this is a possibly dangerous operation; do *not* use +it unless you understand the implications (see linkgit:git-rebase[1] +for details). + pull.octopus:: The default merge strategy to use when pulling multiple branches at once. diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index e1da468766..0f18ec891a 100644 --- a/Documentation/git-pull.txt +++ b/Documentation/git-pull.txt @@ -108,7 +108,7 @@ include::merge-options.txt[] fetched, the rebase uses that information to avoid rebasing non-local changes. + -See `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 `{litdd}rebase` instead of merging. + |