Logo Questions Linux Laravel Mysql Ubuntu Git Menu
 

git rebase -i presents an empty MacVim file

I'm trying to rebase a commit. However, any time I run git rebase -i f83eff3ffc8, for example, a MacVim window opens, that's empty (there is no information in the file). Then once I write and close the file (even though it's empty), I get a Successfully rebased and updated refs/heads/clicktocall-hotfix message.

The file name is .git/rebase-merge/git-rebase-todo. I also tried running it with sudo but this didn't make a difference.

What could be the problem? I've never successfully completed a rebase.

like image 476
Kevin Burke Avatar asked Jan 04 '12 07:01

Kevin Burke


2 Answers

For atom I was able to fix by adding the wait flag to gitconfig (reference https://help.github.com/articles/associating-text-editors-with-git/)

[core]
    editor = atom --wait 
like image 168
myfashionhub Avatar answered Oct 24 '22 03:10

myfashionhub


I was using Macvim and needed to run mvim with the -f option, as documented here: GIT_EDITOR not working with macvim

like image 23
Kevin Burke Avatar answered Oct 24 '22 05:10

Kevin Burke