pull: introduce a pull.rebase option to enable --rebase
commit6b37dff17f176d7e87efa93b4cf521dd725de247
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>
Sun, 6 Nov 2011 09:50:10 +0000 (6 10:50 +0100)
committerJunio C Hamano <gitster@pobox.com>
Mon, 7 Nov 2011 16:43:11 +0000 (7 08:43 -0800)
treeedc3e6b83dc65d4075eb58dad3982a33b89a9153
parentf696543dad6c7ba27b0c4fab167a5687263a9ba0
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>
Documentation/config.txt
Documentation/git-pull.txt
git-pull.sh
t/t5520-pull.sh