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/git-blame.txt | |
parent | Git 1.7.6 (diff) | |
download | tgif-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/git-blame.txt')
0 files changed, 0 insertions, 0 deletions