Merge branch 'rr/format-patch-count-without-merges' into next
commit4ae3edc197c91f604d53b31f1f14e06db4c2699e
authorJunio C Hamano <gitster@pobox.com>
Wed, 22 Sep 2010 16:35:59 +0000 (22 09:35 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 22 Sep 2010 16:35:59 +0000 (22 09:35 -0700)
tree3dba39eeeca2901053b97c32473ced955961b071
parent958ca95f11203ec8b52b11040e1f21f02dc7863b
parent2c642ed8668745271a714f0a672dbfcd6b0a6fa8
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
Documentation/git-format-patch.txt
builtin/log.c
t/t4014-format-patch.sh