T
T
Timur Yakhin2014-11-30 20:15:23
git
Timur Yakhin, 2014-11-30 20:15:23

How to get rid of message when git pull in console?

Every time you do a git pull on the server, the editor (nano) opens with the message:

Merge branch 'test' of bitbucket.org:*********/********** into test

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

How to make sure this doesn't happen?
PS There is a second server, there is no such thing.

Answer the question

In order to leave comments, you need to log in

2 answer(s)
S
Sergey Krasnodemsky, 2014-11-30
@temoffey

git pull --help
read information on --no-edit key and GIT_MERGE_AUTOEDIT environment variable

A
askretov, 2015-12-31
@askretov

The answer is divided into 2 parts.
1. If you understand that the state of the branch has scattered, but just want the editor not to pop up to make a comment on the merge, then the answer was above about git_merge_autoedit. That is, add a variable to the environment GIT_MERGE_AUTOEDIT=no. On the other server, there is no such thing, because, apparently, there is already present in the environment there GIT_MERGE_AUTOEDIT=no.
2. If you are trying to understand the nature of the need to merge, during the execution of the pull, then it is that while you were doing something locally, someone managed to make their changes to this branch. There are two main ways - either use stash before the commit, or rebase after commits.

Didn't find what you were looking for?

Ask your question

Ask a Question

731 491 924 answers to any question