diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2011-11-06 10:50:10 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-11-07 08:43:11 -0800 |
| commit | 6b37dff17f176d7e87efa93b4cf521dd725de247 (patch) | |
| tree | edc3e6b83dc65d4075eb58dad3982a33b89a9153 /Documentation/config.txt | |
| parent | f696543dad6c7ba27b0c4fab167a5687263a9ba0 (diff) | |
| download | git-6b37dff17f176d7e87efa93b4cf521dd725de247.tar.gz git-6b37dff17f176d7e87efa93b4cf521dd725de247.tar.xz | |
pull: introduce a pull.rebase option to enable --rebase
Currently we either need to set branch.<name>.rebase for existing
branches if we'd like "git pull" to mean "git pull --rebase", or have
the forethought of setting "branch.autosetuprebase" before we create
the branch.
Introduce a "pull.rebase" option to globally configure "git pull" to
mean "git pull --rebase" for any branch.
This option will be considered at a lower priority than
branch.<name>.rebase, i.e. we could set pull.rebase=true and
branch.<name>.rebase=false and the latter configuration option would
win.
Reviewed-by: Sverre Rabbelier <srabbelier@gmail.com>
Reviewed-by: Fernando Vezzosi <buccia@repnz.net>
Reviewed-by: Eric Herman <eric@freesa.org>
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Liked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 6b9377719..256d27c3b 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -668,10 +668,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 @@ -1548,6 +1550,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. |