![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 22 Sep 2010 16:35:59 +0000 (09:35 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 22 Sep 2010 16:35:59 +0000 (09:35 -0700) | ||
| commit | 4ae3edc197c91f604d53b31f1f14e06db4c2699e | |
| tree | 3dba39eeeca2901053b97c32473ced955961b071 | tree | snapshot |
| parent | 958ca95f11203ec8b52b11040e1f21f02dc7863b | commit | diff |
| parent | 2c642ed8668745271a714f0a672dbfcd6b0a6fa8 | commit | diff |
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
* 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 | diff1 | | diff2 | | blob | history |
| builtin/log.c | diff1 | | diff2 | | blob | history |
| t/t4014-format-patch.sh | diff1 | | diff2 | | blob | history |