分支情况:
dev
location
* master
new
操作的时候使用命令:
git merge location
然后会出现commit message的注释
请问各位是什么地方出错了?
phpcn_u15822017-04-25 09:05:34
Nothing wrong...
If you use git help merge
,就会看到git merge
's documentation.
Then it mentioned:
Then "git merge topic" will replay the changes made on the topic branch since it perged from master (i.e., E) until its current commit (C) on top of master, and record the result in a new commit along with the names of the two parent commits and a log message from the user describing the changes.
Before merge
A---B---C topic
/
D---E---F---G master
After merge
A---B---C topic
/ \
D---E---F---G---H master
So, the commit message is automatically added.
If you really hate this commit, you can add it when merging--no-commit
. In this way, no commit message will be generated. However, I don’t recommend doing this. In this case, it will not be easy to distinguish the results of the merge.