A long time ago before git I've casually run into quilt[1]. Not really immediate but if you don't like git may be nice to use. On IETF[2] there's a quick tutorial too.

[1] http://savannah.nongnu.org/projects/quilt

[2] https://tools.ietf.org/doc/quilt/quilt.html