From: "Konstantin Khomoutov" <flatw...@users.sourceforge.net>
Sent: Wednesday, May 20, 2015 4:02 PM
On Wed, 20 May 2015 09:25:37 +0200
Magnus Therning <mag...@therning.org> wrote:

[...]
>>> 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.

I don't use TortoiseGit, and tend not to use GitExtensions either (but do keep GitExt up to date). I find those tools give a false/poor view of how the source control is happening which prevents me getting a good picture of what is where (e.g. the real remote server(s) vs local tracking branch(es))

Rather I (currently) use the "Msysgit" bash for command line stuff, then 'git gui &' and 'gitk -30 &' for the windows gui style visualisation, with Notepad++ as my core editor (see below). The '&' allows me to keep the windows open while still switching back to the bash window.

I'm starting the shift to the newer G4W mintty bash window (and SDK when apprpriate)

>
>> 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`).

I seconds this.

Personally I disagree ;-) I do use a balance of Windows and Git tools. (I remember the 70's with real teletypes, especially the good bits; but, just the same, if it's OK with you ...;-)


I checked if Windows 7 still includes the venerable edit.exe from the
MS-DOS time (Windows XP did have it) but it seems it doesn't anymore,
and Git for Windows ships with Vim which is a console editor and hence
it should reliably work for that edit -> close -> continue cycle.

Sure, for a Windows user Git is quite atypical, but one just have
to learn to hit <Ins> to go to insert mode -- familiar for most Windows
users -- fool around using cursor keys, <Delete>, <Backspace> etc
and then hit <Esc> to return to normal more, where the ZZ command
should save and quit.

So I'd change the editor temporarily by

 git config --local --add core.editor vi

For me:
[core]
editor = 'C:/Program Files/Notepad++/notepad++.exe' -multiInst -notabbar -nosession -noplugin

works just fine. I don't have a link to the original thread/blog that gave it but it works just nice, with the Git editing coming up separately and distinctly from my regular tabbed editing window.


and retry the rebase changing the first "pick" to "edit" and see what
happens: if the rebase will continue and stop at that edit, the OP
will be able to just run

 git rebase --abort

to, well, abort the rebase.

Hence, if that works, we'll be able to work on how to properly hook
Notepad++ there.  Otherwise the problem is elsewhere and probably
the way to go would be running `git rebase` in trace mode.


Hope this helps for an alternate viewpoint.

regards

Philip<

--
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