Andrew's git / gitweb.git / diff
?
Merge branch 'rr/format-patch-count-without-merges'
authorJunio C Hamano <gitster@pobox.com>
Wed, 29 Sep 2010 20:49:09 +0000 (13:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 29 Sep 2010 20:49:09 +0000 (13:49 -0700)
* rr/format-patch-count-without-merges:
format-patch: Don't go over merge commits
t4014-format-patch: Call test_tick before committing

1  2 
Documentation/git-format-patch.txt patch | diff1 | diff2 | blob | history
builtin/log.c patch | diff1 | diff2 | blob | history
t/t4014-format-patch.sh patch | diff1 | diff2 | blob | history
diff --cc Documentation/git-format-patch.txt
Simple merge
diff --cc builtin/log.c
Simple merge
diff --cc t/t4014-format-patch.sh
Simple merge