How to work with non-local branches for the warranty of the commit atomicity (possible strategy/man):

gistfile1.txt

# Create branch from master/development/another working branch
git checkout -b branch_name

# Write code
# Add code to commit
# (Use a/u (add/update) options of the interactive command for adding new files/updating existing files)
git add -i
# Create commit
git commit

# Simply push commit to non-local branch:
git push origin branch_name

# Add code to commit
# (Use a/u (add/update) options of the interactive command for adding new files/updating existing files)
git add -i
# Complete commit
git commit --amend 

# Push completed commit to server
git push origin branch_name -f

# Then you will have single commit at server