It often happens during a merge that a number of files in a repository will have conflicts. It is already possible to apply the conflict solver to individual files, but I would like to propose the following workflow:

During a merge when multiple files are conflicted:

1. Select all the conflicted files.
2. Choose to activate the Conflict Solver.
3. For each file in the select list open the conflict solver (as is done for a single file)
4. User solves conflicts (or decides to cancel), thus terminating the conflict solver for that file.
5. SmartGit shows a dialogue with the following options "Stage file", "Skip file", "Cancel".
6. "Stage file" will stage the file and SmartGit will automatically open the conflict solver for the next file in the selected list.
7. "Skip file" will not stage the file, or mark it as resolved, etc, but will move automatically to the next file in the list, opening the conflict solver for the next file.
8. "Cancel" will stop the process completely. Files already staged will remain staged.

This will, in my opinion, make merging multiple conflicted files much easier. There could also be a button on the ToolBar which starts the conflict solver for all conflicted files in the current repo, without the user having to select them all.

The ability to use a ssh connection or tunnel to remotely control git commands on a remote server. This would allow me to connect to other servers and do git / pull /logs...etc.

Support interactive rebase directly from SmartGit.

To continue rebase after fixing a conflict, you have to press Commit.

To abort it, you select the project and press Discard?

These aren't very clear actions. It would be better if the buttons actually changed their names while in the middle of a rebase.

To unite Log and "Working Tree" window, there are two options: add Log functionality to the "Working Tree" window or add working tree functionality to the Log window. For conceptual and technical reasons, we opted for the latter option: https://smartgit.userecho.com/topics/655

Instead of having a separate Log window, this should be part of the main window in order to have all functionality of SmartGit be available in a single window.

This would mean to add all views of the Log to the main window, duplicating a couple of them with slightly different meaning, e.g. the Changes view in the Log is purely read-only, but can show comments - the one in the repository window can be used to stage/unstage; the Files view in the Log does not allow any of the main window's commands; the Branches view in the Log allows toggling anchor commits for the Commits graph and shows additional items, e.g. recyclable commits. It would be a horrible amount of work and still would require stand-alone Log windows, e.g. for file or subdirectory logs.

The simplified or "unified" diff view (the default on GitHub for example) is often the preferred way to look at changes, especially on smaller screens

See e.g. http://stackoverflow.com/questions/3040833

Display git-notes in the log.

It is possible to tell git diff how to convert files into a readable form for the diff command.  For example with the following lines slx files are unzipped before the diff is shown

[diff "slx"]
textconv = unzip -c -a

See also this topic

https://stackoverflow.com/questions/34356401/diff-between-simulink-models-slx

A similar but more specific idea is already on this site

https://smartgit.userecho.com/topics/369-support-smudge-filter-for-git-crypt-diff/

As in this comment

> It would be awesome to have an option "Add To Ignore List" which allows to choose "add to .gitignore" or "add to .git/info/exclude (will be ignored at this computer only)".

When we right-click on a file to ignore it, it should give the option of ignoring it in a .gitignore (that gets committed along with the repo) or .git/info/exclude (which is unique to our computer) or a global gitignore for all repos (garbage files like Thumbs.db. etc)