From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 2 Jun 2015 20:35:52 +0000 (-0700)
Subject: Merge branch 'pt/pull-tests' into pt/pull-optparse
X-Git-Tag: v2.5.0-rc0~25^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2c9c1c517896ece5003489adac6eaae5f7ad27b3;p=git

Merge branch 'pt/pull-tests' into pt/pull-optparse

* 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
---

2c9c1c517896ece5003489adac6eaae5f7ad27b3