Search code examples
gitgit-rebase

Git rebase --continue opens editor

After a rebase failed with a conflict, I could not continue the rebase using a Git GUI client. When performing

git rebase --continue

on command line (msysgit 1.7.4), it opened a text editor. After having closed it, Git continued. How can opening the editor be avoided?

Solution

  • When a rebase fails, you have to manually fix the file and then exec git add filename to signal that everything is OK. At this point, git rebase --continue will continue the procedure without bothering you.

    To change the default editor git uses issue: git config --global core.editor new_editor

    Commands such as commit and tag that lets you edit messages by launching an editor uses the value of this variable when it is set, and the environment variable GIT_EDITOR is not set. See git-var(1).