Geek Answers Handbook

How to remove git MERGE_MSG?

I tried a few suggested things, but it doesn't seem to delete anything. It started when I upgraded to Mountain Lion OS X. Each time I do a git pull , it displays that annoying heck-like empty editor with the title MERGE_MSG.

How can I prevent global ascent in all my applications?

+8
git git-pull merge
source share
3 answers

You can pass --no-edit to git pull , or you can set the GIT_MERGE_AUTOEDIT environment GIT_MERGE_AUTOEDIT to no .

In the git pull documentation:

  --edit, --no-edit Invoke an editor before committing successful mechanical merge to further edit the auto-generated merge message, so that the user can explain and justify the merge. The --no-edit option can be used to accept the auto-generated message (this is generally discouraged). The --edit option is still useful if you are giving a draft message with the -m option from the command line and want to edit it in the editor. Older scripts may depend on the historical behaviour of not allowing the user to edit the merge log message. They will see an editor opened when they run git merge. To make it easier to adjust such scripts to the updated behaviour, the environment variable GIT_MERGE_AUTOEDIT can be set to no at the beginning of them.
+13
source share

Merging a remote branch with a local one gives more control, then pulls. a merge can be “fast” ahead (a merge message is not required), a merge message may make sense. Pull does not give you the ability to “fast forward” and always generates a default merge message, which is not recommended.

0
source share

A git pull is a git fetch followed by a git merge . - A merge, if it leads to a merge commit, requests this message.

I would suggest doing git rebase instead of merging. This helps keep the story linear and avoids additional compliments. A git pull --rebase does this at a time (i.e. This is a git fetch followed by a git rebase ).

0
source share

More articles:


All Articles