From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 22 Sep 2010 16:35:59 +0000 (-0700)
Subject: Merge branch 'rr/format-patch-count-without-merges' into next
X-Git-Tag: ko-next~221
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4ae3edc197c91f604d53b31f1f14e06db4c2699e;p=git.git

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

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

4ae3edc197c91f604d53b31f1f14e06db4c2699e