.mailmap should be supported since 22.1. Can you please give it a try and confirm? Then I'm going to close this topic.

You may find our videos series on "How to Clean Up Your History" interesting, especially:

This already works in 23.1 Preview, using Drag&Drop.

Self-hosted GitLab is already supported. It requires a commercial license, though.

In the Standard window, Rename already works as expected.

Thanks for reporting these problems. Please give 23.1 build 20036 a try which should resolve the unexpected error banner and the subsequent hang: Help|Check for Latest Build .

In the Preferences, for Commands, Log do you have "Allow to open multiple Log windows" enabled? Then on Compare, SmartGit should ask you whether to open in the existing or in a new window.

Regarding the "Exceeds configured limit", how can we reproduce this?

When a file is in conflicting state, the .git/index contains stages 1,2 and 3 for the file. These point exactly to the file contents which have been used by Git's merge and these are the file contents which SmartGit's Conflict Solver will display. Once you stage a file, these .git/index entries are removed and replaced by a stage 0 entry (which means a normal file). Hence, SmartGit has not enough information anymore to display the Conflict Solver. A good summary can be found here:

https://stackoverflow.com/a/65968958

Without re-implementing too much of Git's internal logic, SmartGit may be able to get the three stages back using "git checkout --merge", however this will also overwrite the current working tree content:

https://stackoverflow.com/questions/61172881