On Mon, May 25, 2015 at 08:04:55PM +0200, Daniel Hahler wrote:
> On 24.05.2015 22:24, brian m. carlson wrote:
> 
> >   grep: .git/rebase-merge/git-rebase-todo: No such file or directory
> > 
> > I'm using Git 2.4.0, and that file doesn't appear to exist in newer Git
> > versions.  I've also tried with Git 2.1.4, and it appears to be absent
> > there as well.
> 
> The file is used with interacive rebasing ("git rebase -i"), see
> git-rebase--interactive.sh in Git's source.
> 
> Were you running into a conflict with "git rebase -m", or used some other
> option that would have aborted/interrupted it?
> Does it happen for every "git rebase -m"?

Yes, in this particular case I'm running into a conflict.  It's just git
rebase -m, not git rebase -i -m.  The file in question is only used by
git-rebase--interactive.sh, which is only triggered with -i.

It always happens when I encounter a conflict with git rebase -m without
using -i.
-- 
brian m. carlson / brian with sandals: Houston, Texas, US
+1 832 623 2791 | http://www.crustytoothpaste.net/~bmc | My opinion only
OpenPGP: RSA v4 4096b: 88AC E9B2 9196 305B A994 7552 F1BA 225C 0223 B187