t5520: test --[no-]autostash with pull.rebase=true

Mehul Jain committed over 10 years ago

t5520: reduce commom lines of code

Mehul Jain committed over 10 years ago

t5520: factor out common "failing autostash" code

Mehul Jain committed over 10 years ago

t5520: factor out common "successful autostash" code

Mehul Jain committed over 10 years ago

t5520: use better test to check stderr output

Mehul Jain committed over 10 years ago

t5520: ensure consistent test conditions

Mehul Jain committed over 10 years ago

t5520: use consistent capitalization in test titles

Mehul Jain committed over 10 years ago

mergetools: add support for ExamDiff

Jacob Nisnevich committed over 10 years ago

mergetools: create mergetool_find_win32_cmd() helper function for winmerge

Jacob Nisnevich committed over 10 years ago

First batch for post 2.8 cycle

Junio C Hamano committed over 10 years ago

Sync with Git 2.8.1

Junio C Hamano committed over 10 years ago

Merge branch 'jk/startup-info'

Junio C Hamano committed over 10 years ago

Merge branch 'es/test-gpg-tags'

Junio C Hamano committed over 10 years ago

Merge branch 'jk/getwholeline-getdelim-empty'

Junio C Hamano committed over 10 years ago

Merge branch 'rj/xdiff-prepare-plug-leak-on-error-codepath'

Junio C Hamano committed over 10 years ago

Merge branch 'jc/index-pack'

Junio C Hamano committed over 10 years ago

Merge branch 'gf/fetch-pack-direct-object-fetch'

Junio C Hamano committed over 10 years ago

Merge branch 'jc/maint-index-pack-keep'

Junio C Hamano committed over 10 years ago

Merge branch 'mm/lockfile-error-message'

Junio C Hamano committed over 10 years ago

Merge branch 'jk/rev-parse-local-env-vars'

Junio C Hamano committed over 10 years ago