Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Nov 7, 2011
  1. Ævar Arnfjörð Bjarmason Junio C Hamano

    pull: introduce a pull.rebase option to enable --rebase

    avar authored gitster committed
    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>
Commits on May 21, 2011
  1. Ævar Arnfjörð Bjarmason Junio C Hamano

    i18n: git-pull eval_gettext + warning message

    avar authored gitster committed
    Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Ævar Arnfjörð Bjarmason Junio C Hamano

    i18n: git-pull eval_gettext + die message

    avar authored gitster committed
    Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. Ævar Arnfjörð Bjarmason Junio C Hamano

    i18n: git-pull die messages

    avar authored gitster committed
    Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. Ævar Arnfjörð Bjarmason Junio C Hamano

    i18n: git-pull add git-sh-i18n

    avar authored gitster committed
    Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Something went wrong with that request. Please try again.