Greetings, With current git.git (1.6.2.2.446.gfbdc0) built for Cygwin, running on Windows XP, executing the following commands... mkdir test cd test git init echo initial > kala.c echo initial > sur.c git add *.c git commit -m "Initial commit." echo addition >> kala.c git commit -a -m "Kala addition 1." echo addition >> sur.c git commit -a -m "Sur addition." echo addition2 >> kala.c git commit -a -m "Kala addition 2." git rebase -i HEAD~3 ...and moving commit "Kala addition 2." right after "Kala addition 1." and marking it to be squashed results to ---8<---------------------------------------------------- error: Entry 'kala.c' not uptodate. Cannot merge. fatal: merging of trees 787519579d90e45dfee00189985fa8c92f56be8f and 83f124d88764604c7d348e73103168bd98665e56 failed Could not apply 14eb9c7... Kala addition 2. ---8<---------------------------------------------------- rebase -i used to work fine earlier, but unfortunately I don't remember which version I used back then (1.6.something). This problem doesn't occur on Linux with the same git version. I don't know if it might be related (I suppose it could be because of that "...not uptodate" message) but I also see the following behaviour with gitk: * I change a file in workspace. * I "Update" in gitk - I see the change. * I undo the change. * I "Update" in gitk - I see an empty change. * "Reload" doesn't help - I still se an empty change. * I run "git status" on the command line and then select "Update" in gitk -> now the change disappears. -- Hannu -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html