Re: [git-users] need clarification on interactive rebase, please

2012-03-22 Thread PJ Weisberg
On Wednesday, March 21, 2012, Les Nightingill 
wrote:
> Solved! (not entirely sure why, though!). Posting the solution here for
future Googlers.
> The solution is on StackOverflow
http://stackoverflow.com/questions/4737381/git-editor-not-working-with-macvim
> The solution is this configuration:
>
> git config --global core.editor "mvim -f"

In general, any editor that opens itself *in the background* is not going
to work.  When the editor hands control back to Git, Git thinks it's
because you're done editing.  Any other command-line tool that uses $EDITOR
will have the same issue.

I'll bet you saw a blank file because Git deleted the file (which it
thought you were done with) before mvim got around to opening it.

-- 
-PJ

Gehm's Corollary to Clark's Law: Any technology distinguishable from
magic is insufficiently advanced.

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To post to this group, send email to git-users@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.



[git-users] need clarification on interactive rebase, please

2012-03-21 Thread Les Nightingill
...trying to understand how interactive rebase works...

under what circumstances does git rebase -i 
simply complete and present an empty git-rebase-todo for editing (i.e.
without a list of commits for me to pick/edit/squash etc)?

In my test, the rebase completes with the message "Successfully
rebased and updated refs/heads/newbranch." AND also a blank file (.git/
rebase-merge/git-rebase-todo) is opened in my editor.

I must be missing something... any suggestions would be appreciated

Les

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To post to this group, send email to git-users@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.