![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Thu, 29 Jun 2006 06:42:40 +0000 (23:42 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Thu, 29 Jun 2006 06:42:40 +0000 (23:42 -0700) | ||
| commit | f38c2a9c9982950109d0eb0802b9713dfffeb18b | |
| tree | 4a6eaddf3b13001890946291b595255a13f403e6 | tree | snapshot |
| parent | abc02670169cee9541793a86324a014272ca8ed5 | commit | diff |
| parent | 9fdc3bb5c20e37e410e03ed5b6c71a7e647ccee8 | commit | diff |
Merge branch 'js/patch'
* js/patch:
diff.c: fix get_patch_id()
t4014: fix test commit labels.
format-patch: use clear_commit_marks() instead of some ad-hockery
t4014: fix for whitespace from "wc -l"
t4014: add format-patch --ignore-if-in-upstream test
format-patch: introduce "--ignore-if-in-upstream"
add diff_flush_patch_id() to calculate the patch id
* js/patch:
diff.c: fix get_patch_id()
t4014: fix test commit labels.
format-patch: use clear_commit_marks() instead of some ad-hockery
t4014: fix for whitespace from "wc -l"
t4014: add format-patch --ignore-if-in-upstream test
format-patch: introduce "--ignore-if-in-upstream"
add diff_flush_patch_id() to calculate the patch id