[haolez]

Why not use a branch? This was the only surprisingly part to me. Won't this get messy when I try to pull the code later on? I don't know how the maintainer is going to merge my patch.

[diggan]

You could do it in a branch if you want to, doesn't matter, as long as the diff/patch is based on the branch where upstream does its main work.