diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-04-13 14:12:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-04-13 14:12:36 -0700 |
| commit | 7c137bb5316fbd82e816c2dabebc1d347261c93e (patch) | |
| tree | c2e928c5797ffcae135f2d7dca03d324f3e2fb22 /lockfile.c | |
| parent | Merge branch 'jn/mergetools-examdiff' (diff) | |
| parent | t5520: test --[no-]autostash with pull.rebase=true (diff) | |
| download | tgif-7c137bb5316fbd82e816c2dabebc1d347261c93e.tar.xz | |
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()
Diffstat (limited to 'lockfile.c')
0 files changed, 0 insertions, 0 deletions