From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 11 Jun 2015 16:29:58 +0000 (-0700)
Subject: Merge branch 'pt/pull-tests'
X-Git-Tag: v2.5.0-rc0~42
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0e04b248b5d5828b907a346e920dda4003311406;p=thirdparty%2Fgit.git

Merge branch 'pt/pull-tests'

Add more test coverage to "git pull".

* pt/pull-tests:
  t5520: check reflog action in fast-forward merge
  t5521: test --dry-run does not make any changes
  t5520: test --rebase failure on unborn branch with index
  t5520: test --rebase with multiple branches
  t5520: test work tree fast-forward when fetch updates head
  t5520: test for failure if index has unresolved entries
  t5520: test no merge candidates cases
  t5520: prevent field splitting in content comparisons
---

0e04b248b5d5828b907a346e920dda4003311406