Why don't I have to commit after git merge -



Why don't I have to commit after git merge -

i have repo master , file1.txt , file2.txt

git checkout -b fix1

i alter file1.txt

and

git commit -a

then a

git checkout master

then

git checkout -b fix2

i alter file2.txt

and

git commit -a

then git checkout master

git merge fix1 git marge fix2

but if a

commit -a

i get

# on branch master nil commit (working directory clean)

git merge commits automatically. if don't want commit add together --no-commit argument:

--commit, --no-commit perform merge , commit result. alternative can used override --no-commit. --no-commit perform merge pretend merge failed , not autocommit, give user chance inspect , farther tweak merge result before committing.

git git-merge

Comments

Popular posts from this blog

web services - java.lang.NoClassDefFoundError: Could not initialize class net.sf.cglib.proxy.Enhancer -

Accessing MATLAB's unicode strings from C -

javascript - mongodb won't find my schema method in nested container -