Adding a git commit message using vi on OS X

Question

I'm learning using Git on an OS X Terminal. It seems really easy. But I can't handle just one problem: When I try to merge two branches, for example "myTestBranch" into "master" this program covers the terminal and shows me a new view where I should write the merge message. And then, I don't know how to do "Enter", save the merge message and then come back to the main terminal view where I can continue working.

Does anyone know, how does it work?

Answer 1

If you haven't change the default git's editor, that "new view" is the Vi program.

To save your commit message using Vi, follow the next steps:

1. Type i
2. Write your message
3. Type the ESC key
4. Type :wq
5. DONE! :D

Typing :q, step 4, is not enough beacuse just means QUIT without saving. That's why you need :wq, which means WRITE and QUIT.

You can write your commit message using your favourite editor(vim, emacs, etc.). To achieve this, you can use configuration parameter or environment variables, listed in order:

1. GIT_EDITOR environment variable
2. core.editor configuration option
3. VISUAL environment variable
4. EDITOR environment variable

Using the configuration option type something like this:

$git config --global core.editor "nano" 

Or if you want to use enviroment variables, add something like this to your .bash_profile

$export GIT_EDITOR="PATH/TO/YOUR/EDITOR"