Please allow users to merge a branch and push in one menu click.

Now it's like this:

- checkout the destination branch

- right click on the branch you want to merge

- click on "merge..."

- wait for merge to succeed or fail

- click push

I'd like to be like this:

- checkout the destination branch

- right click on the branch you want to merge

- click on "merge and push..." *

*push should be done automatically when there are no conflicts

I have a lot of repos in group hierarchies in SmartGit, and sometimes I am editing a file (outside SmartGit) but I am not sure where this repo is located in SmartGit.

I would like to have some search functionality to locate a filename to find the repo it exists in (can be multiple off course).

In some cases during a rebase process (generally when reordering commits), when fixing a conflict I know there should be a conflict on next commit but this conflict is not detected.

In such case, when I continue rebase, the rebase finishes and ends-up with an unexpected change. Then I have to modify the "next commit" to apply the change that was missed.

This happens easily if you have a commit A that adds a function (any block of new lines), and a commit B that renames some variables, including in this new function.
If you switch commits order, you will probably end-up with the added function without expected renamed variables. You would have a conflict to solve when applying commit B, and the solution of the conflict would be to ignore extra lines (they will be added with commit A after). Then when you continue, commit A will just add the lines, without any conflict (new lines in both cases).

In such case, it would be really great if I could request git to stop after the next commit (like the edit option in interactive rebase), so I can apply the changes I know I need to apply.

When a rebase is in progress, I can see all next commits in the graph with the usefull "[todo +N]" labels. This is great.
If I had for example a contextual menu Item "Add rebase break" or anything alike on those commits "to be rebased", it would be wonderful.

It would be a little bit like interactive rebase, but defined during a current rebase instead of defining it at the beginning of the rebase process.

When SmartGit detects that main branch is ahead of feature branch, the default git-flow action is to merge or rebase changes. However, if it could be just a tiny bit smarter it could detect that the reason it's ahead is that the feature branch has already been merged into main (typically because of acceptance of pull request), and the default action should now be to Finish the feature, by fast-forward merging to main, checking out main, and deleting the local feature branch (which is probably local-only now, as the remote feature branch will have been deleted as part of the remote closing of that feature)

I use "Follow Only First Parent" in my log and love it, but it's not available in the Cherry-Pick or Merge dialogs where I think it would also be useful. It could follow the log setting, or have an independent control...but being able to change it within the dialog would probably be desired.

It would be cool if the diff panels could show a floating header with the current function or method, so you don't have to scroll up and down to figure out the context.

For example, GitHub does this with a blue banner:

That `handle_two_factor` method is on line 103.

Add an option for setting the font of the 'Commit' window to a fixed size font, so the commit message is shown with that instead of a variable size font.

Also, an option for en-/disabling auto word wrap in that window would be nice to have.

Git offers a configuration option named skipFetchAll (available since Git v1.6.6) that causes commands to process all repositories (git fetch --all and git remote update) to ignore remotes having this setting.

When fetching all remotes (either interactively from the Pull button with Fetch from all remote option checked, or from Background fetch), SmartGit should respect Git's skipFetchAll config option.

After locally reviewing many Pull Requests, the "Pull Requests" tree in the Log window gets longer and longer. So I'd like to clean up the tree by dropping their local data. But the "Drop Local Data" context menu item is not available if multiple PRs are selected, it's only available on single selection: