I'm not sure to follow everything... But looks like:
$ git add -p
or
$ git add -i
should do what you want, no?
You select the hunks to commit, let over the "hacks" and then
$ git commit
--
Pascal Obry / Magny Les Hameaux (78)
The best way to travel is by means of imagination
http://v2p.fr.eu.org
http://www.obry.net
gpg --keyserver keys.gnupg.net --recv-key F949BD3B