Git rebase -i does nothing
I am having problems with git rebase -i
that do not work as I expect from reading various parts of the online documentation and tutorials.
I am trying to squash the last four commits into one. Imagine a branch dev
with a remote origin/dev
and write
A -> B -> C -> D -> E
│ └ dev
└ origin/dev
And I want to end here:
┌ dev
A -> F
│
└ origin/dev
Where F contains all the changes from B, C, D and E. So given what I've checked dev
, I should be able to run git rebase -i origin/dev
or git rebase -i HEAD~4
and then squash C, D and E, right?
Here's my problem: Running any of these rebase commands doesn't trigger a git popup to do anything. The console just returns:
Successfully rebased and updated refs/heads/dev.
I am confused why interactive permutation is not working? Are there any problems with my git config?
Update
git config --global rebase.autoSquash
returns nothing
source to share
Ok, I found the answer: this is my git config after all.
After installing Github Atom yesterday, I followed the instructions at http://blog.atom.io/2014/03/13/git-integration.html , namely:
git config --global core.editor "atom --wait"
What happens is that every time I tried to restart Atom, I crashed immediately. git interpreted this as me, ending up with a rebase, and just fetched all commits that had no network effect.
Annoying problem to find but got there in the end.
source to share