In git, if part of a file is staged and part is unstaged, commit only staged changes:

cp file file.unstaged 
git co file 
git ci file 
mv file.unstaged file