Git partial commit of staged changes

Question

My current git status looks like this:

# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#       modified:   docs/file3.org
#       modified:   src/main/R/lib.R
#
# Changes not staged for commit:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#       modified:   docs/file3.org
#       modified:   src/main/R/lib.R

I'd like to commit the staged changes to docs/file3.org first, then the other staged changes. But if I do git commit -m '...' docs/file3.org, it will commit both the staged & unstaged changes to that file.

Is there an easy way to do this? Or do I need to stash my unstaged changes, unstage one of the files, commit the other, restage, commit, and stash pop?

Answer 1

Since you only need to commit the staged changes to a file, you can just stash, keeping the indexed changes intact, and committing the file after that.

git stash --keep-index #Note that the staged changes also become part of the stash
git commit -m "Commit only one file" docs/file3.org

git commit -m "Commit other staged changed"
git stash pop 
# This may raise CONFLICTS since the stash includes the earlier staged changes.
# In case of conflict, the stash is not popped, so you need to drop it explicitly.