On 19 May 2015 at 21:38, Michael Powell <mwpowell...@gmail.com> wrote:
> On Tue, May 19, 2015 at 3:28 PM, Konstantin Khomoutov
> <flatw...@users.sourceforge.net> wrote:
>> On Mon, 18 May 2015 10:42:54 -0400
>> Michael Powell <mwpowell...@gmail.com> wrote:
>>> I have set the global editor to Notepad++ via a shell script:
>>> #!/bin/sh
>>> "C:/Program Files (x86)/Notepad++/notepad++.exe" -multiInst -notabbar
>>> -nosession -noPlugin "$(cygpath -w "$*")"
>> Does this really work?  (I mean, did you verify the second line of
>> your script by running it in Git Bash?)
> Yes, it "runs" as far as I know. I work in Notepad++, and when I save
> and close N++, Git claims to have processed the file.
>> I'm asking because in a Unix shell (and in cmd.exe too, FWIW) double
>> quotes do not nest so I'm having hard time trying to understand
>> what's this line supposed to do.
> I'm not sure, that's what several blogs all report. Of course they
> could all be agreeing on something that needs further elaboration that
> I don't know about.
>> I also wonder how does "cygpath" work.  Git for Windows is not a Cygwin
>> application and I doubt it ships with the program named "cygpath".
>>> Then I proceed with the interactive rebase:
>>> git rebase -i HEAD~3
>>> I want to reorder the second commit to the top. I also want to squash
>>> the first and third commits to a single commit
>>> I edit for pick 3 suchandsuch, pick 1 suchandsuch, pick 2 suchandsuch,
>>> for starters (in reverse order), save and exit.
>>> However, when I verify the log, nothing seems to have happened.
>> This sounds strange to me.  What do you mean by "verify the log"?
> Using TortoiseGit, I "Show Log", and review, yet the same revisions
> are in the same order, which leads me to believe that nothing actually
> happened.
>> After saving the rebase script and closing the editor, you should see
>> Git actually working in your console as the `git rebase` command is
>> rather chatty (by default).  Something like "First, rewinding your
>> HEAD to ..." then "Applying patch (N/M)" etc.  Do you see this?
>> Anything other there?
> Actually, no. I did not see anything like applying patches, etc. There
> was a very succinct, one line response. Probably indicating that
> nothing actually happened.

How are you initiating the rebase, via command line or TortoiseGit?

If you are using the command line I'd start with removing `notepad++`
from the equation and go with the default (most probably that's `vi`).


Magnus Therning                      OpenPGP: 0xAB4DFBA4
email: mag...@therning.org   jabber: mag...@therning.org
twitter: magthe               http://therning.org/magnus

You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Reply via email to