From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 13 Apr 2016 21:12:36 +0000 (-0700)
Subject: Merge branch 'mj/pull-rebase-autostash'
X-Git-Tag: v2.9.0-rc0~123
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7c137bb5316fbd82e816c2dabebc1d347261c93e;p=git-core%2Fgit.git

Merge branch 'mj/pull-rebase-autostash'

"git pull --rebase" learned "--[no-]autostash" option, so that
the rebase.autostash configuration variable set to true can be
overridden from the command line.

* mj/pull-rebase-autostash:
  t5520: test --[no-]autostash with pull.rebase=true
  t5520: reduce commom lines of code
  t5520: factor out common "failing autostash" code
  t5520: factor out common "successful autostash" code
  t5520: use better test to check stderr output
  t5520: ensure consistent test conditions
  t5520: use consistent capitalization in test titles
  pull --rebase: add --[no-]autostash flag
  git-pull.c: introduce git_pull_config()
---

7c137bb5316fbd82e816c2dabebc1d347261c93e