Merge branch 'rr/format-patch-count-without-merges'
commit7fd739cd5720fbd1d170584baff7e4f706df641c
authorJunio C Hamano <gitster@pobox.com>
Wed, 29 Sep 2010 20:49:09 +0000 (29 13:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 29 Sep 2010 20:49:09 +0000 (29 13:49 -0700)
treea7f00c907b31236eba887075542d83410d08782e
parentb3c16ee454effda5ec8033ab665249710f622699
parent2c642ed8668745271a714f0a672dbfcd6b0a6fa8
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
Documentation/git-format-patch.txt
builtin/log.c
t/t4014-format-patch.sh