git - 为什么我不必在 git merge 之后提交

Question

我有一个 repo master，我使用 file1.txt 和 file2.txt

git checkout -b fix1

然后我更改 file1.txt

然后我做了一个

git commit -a

然后我做一个

git checkout master

然后我做一个

git checkout -b fix2

然后我更改 file2.txt

然后我做了一个

git commit -a

然后 git checkout master然后一个

git merge fix1
git marge fix2 

但是如果我做一个

 commit -a 

我明白了

# On branch masternothing to commit (working directory clean)

Answer 1

git merge 自动提交。如果您不想提交，请添加 --no-commit 参数:

  --commit, --no-commit
      Perform the merge and commit the result. This option can be used to override --no-commit.

      With --no-commit perform the merge but pretend the merge failed and do not autocommit, to give the user
      a chance to inspect and further tweak the merge result before committing.