You can actually have changes in the same file with some lines in different changesets.
When needed, you can commit changes to git (when you finish doing work) to make them visible to coworkers.