Ah, sorry, never mind me please, it appears it's yet another case of non-commutative addition in action... :) The order in which you try to squash commits matters. Still I'd be interested to learn about the "laundry list of switches" that has to happen before committing.
Best, Oleg On Mon, Feb 3, 2014 at 11:26 PM, Left Right <[email protected]> wrote: > Some more info: > > $ git --no-pager rebase --continue > cat: /home/wvxvw/.../.git/rebase-merge/stopped-sha: No such file or directory > Cannot 'squash' without a previous commit > git exited abnormally with code 1. > > This is the error that happens if I try to continue after rebase session. > > Best, > > Oleg > > On Mon, Feb 3, 2014 at 11:10 PM, Oleg Sivokon <[email protected]> wrote: >> Hi list, >> Sorry, I have a usability question, not a technical one. It's probably >> more about Git then Magit, but maybe you could give me a hand. >> >> Here's something, I believe, simple, that I'm trying to achieve: >> I have two commits and I want to merge (not as in Git merge, just merge, >> as in English :) together. From reading the documentation, I imagined >> that the way to achieve this would be to: >> 1. Press E (entering interactive rebase mode). >> 2. Mark the commit I want to merge with the previous one as "squash". >> 3. Whoops... how do I let it now I've finished? C-c C-c bails out, and so >> does q. >> No matter how I exit the rebase mode, I end up with detatched head and >> an option to Abort/Revert/Continue. Abort and Revert have the same >> effect, Continue errors. >> >> The question: what did I do wrong, and how to achieve my initial goal? >> >> ----- >> >> As an aside: >> http://www.masteringemacs.org/articles/2013/12/06/introduction-magit-emacs-mode-git/ >> I was trying to read this article, because it seems like it might help >> with the problem, but it only contributed to further confusion :) >> Would you be so kind to comment: >> >>> To open up the commit menu, type c. You'll be given a laundry list of >>> switches, >> >> When I press c, there's never a laundry list of switches, it simply >> displays a buffer for the commit message. Is this some functionality >> that is no longer in Magit? Or is this something very new? >> >> Thanks in advance, >> >> Oleg -- You received this message because you are subscribed to the Google Groups "magit" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/groups/opt_out.
