![[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) |
* rr/format-patch-count-without-merges:
format-patch: Don't go over merge commits
t4014-format-patch: Call test_tick before committing
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