Keep local other configuration hunks unmodified by remote proposed changes

Related to Benjamin_Loison/git/issues/9, Benjamin-Loison/termux-app/issues/79 and #7.