On Thu, Apr 11, 2013 at 08:32:43PM -0500, William Giokas wrote: > On Fri, Apr 12, 2013 at 09:25:25AM +0800, Patrick Haller wrote: > > i mean in the ii repo -> http://git.suckless.org/ii > > I agree...I think they should be put into separate branches. It would > make rebasing to a newer version ridiculously easy for end users, and > managing patches easy as well. > > I currently do something similar with dwm, I have a branch 'pristine' > that tracks origin/master, and a multitude of other branches for > different patches with one that I selectively merge to called > 'patched' that I use for building. There's no reason to keep patches > as patch files in git.
In that case, you might find stacked git (stg) useful [1]. I use it to keep patches on top of origin/master and apply certains ones depending on which machine I'm on. Rob [1]: http://www.procode.org/stgit/
