Re: [LyX/master] Merge branch 'master' of git.l

[Uwe Stöhr]

Am 31.05.2013 14:46, schrieb Vincent van Ravesteijn:

     Merge branch 'master' of git.lyx.org:lyx
Uwe, can you try to avoid these useless merges.

You can do this by not using "TortoiseGit->Pull.." but by using:

- TortoiseGit -> Fetch..
- Check "Launch rebase after fetch" (the next time this options will be 
remembered)
- Press Close.
- Press Start Rebase (if it is disabled, press Abort)
- Press Close.

Lars told me this too but it doesn't work: if rebasing is possible and I press "Start Rebase" I get 
"unrecoverable error occurred" and that is it. I played with this today for a while but rebasing 
does not work, no matter what I do.

regards Uwe