As it turns out, since Git version 2.26, the rebase backend has been switched from apply to merge which is in general superior, but which seems to run slower on Windows, at least for specific scenarios (we couldn’t identify any. Rm: cannot remove directory `c:/_work/project/src/git/.git/rebase-merge': DirectoryĬat. SmartGit comes with its own Git bundled which we are usually updating for every major SmartGit release. Squashing and re-ordering in the Journal was better because you could see the changes in the Log for each commit before deciding which order they should be in. Rm: cannot remove `c:/_work/project/src/git/.git/rebase-merge/done': Permission denied Interactive Rebase is a modal dialog that doesn't allow you to interact with the Log, and doesn't show any other information than the commit summary. HEAD is now at 4c737fb Revert 'Modified file names' git/rebase-merge/head-name: Esse arquivo ou diretório não existeĮsta é a aparência de git rebase -abort: $ git rebase -abortĬat: c:/_work/project/src/git/.git/rebase-merge/quiet: No such file or directoryĬat: c:/_work/project/src/git/.git/rebase-merge/head-name: No such file or directoryĬat: c:/_work/project/src/git/.git/rebase-merge/orig-head: No such file or directory ) dentro do meu repositório dá o seguinte erro:Ĭat. Git mostra o branch atual como (| REBASE-m). Não é uma boa ideia, eu te digo.Īgora, o rebase interativo parece estar 'travado'. Antes de executar o 'git commit -amend' (e depois do git rebase -interactive), decidi que minhas alterações estavam incorretas e executei 'git reset HEAD -hard'. Ive been using SmartGit/Hg for years to help visualize aspects of git. Eu estava tentando consertar um commit quebrado usando as instruções a seguir. Consegui criar uma pequena bagunça no meu repositório git local.

Rebase with smartgit