From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 29 Sep 2010 20:49:09 +0000 (-0700)
Subject: Merge branch 'rr/format-patch-count-without-merges'
X-Git-Tag: v1.7.4-rc0~204
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=7fd739cd5720fbd1d170584baff7e4f706df641c;p=git.git

Merge branch 'rr/format-patch-count-without-merges'

* rr/format-patch-count-without-merges:
  format-patch: Don't go over merge commits
  t4014-format-patch: Call test_tick before committing
---

7fd739cd5720fbd1d170584baff7e4f706df641c