分阶段更改的 Git 部分提交

Question

我当前的 git status 看起来像这样:

# 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

我想先将暂存 更改提交到docs/file3.org，然后再提交其他暂存更改。但是如果我执行 git commit -m '...' docs/file3.org，它会提交对该文件的暂存和未暂存更改。

有没有简单的方法来做到这一点？或者我是否需要stash我未暂存的更改，取消暂存一个文件，提交另一个，重新暂存，提交，然后stash pop？

Answer 1

由于您只需要将分阶段的更改提交到一个文件，您可以只存储，保持索引更改不变，然后再提交文件。

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.