| commit | 102783407e5d2db0fe24493694dfca7d61a582ad | |
| author | Josef 'Jeff' Sipek <jeffpc@josefsipek.net> | |
| Mon, 15 Sep 2008 17:14:08 +0000 (15 13:14 -0400) | ||
| committer | Josef 'Jeff' Sipek <jeffpc@josefsipek.net> | |
| Tue, 30 Sep 2008 15:51:41 +0000 (30 11:51 -0400) | ||
| tree | cc4da25f33ad03dbc9b78bf645502722ba52c412 | treesnapshot (tar.gz zip) |
| parent | 76a534df7e993d85b26a4458663a60508ac1292b | commitdiff |
guilt-fold: merge headers of the 2 patches
fold likes to "lose" the header of the patch being folded. This changes
merges the 2 headers in a really simple way:
* if there are no headers, do nothing
* if there is only one header, use it
* if there are two headers, use the current patch's header, followed by a
delimiting line, followed by the folded patch's header
Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
fold likes to "lose" the header of the patch being folded. This changes
merges the 2 headers in a really simple way:
* if there are no headers, do nothing
* if there is only one header, use it
* if there are two headers, use the current patch's header, followed by a
delimiting line, followed by the folded patch's header
Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
| guilt | diffblobblamehistory |