When switching to/from a branch where new files are added sometimes files are left behind (soapui project xml for example), when switching back to the branch with the new files you'll often get the warning "The following untracked working tree files would be overwritten by checkout", and a list.

It would be nice to have an option added to this dialog to basically say "ok, overwrite them". Instead of having to look them up 1 by 1, and manually deleting them before trying to switch to the branch a second time.

Hello,

Summary : introduce ability to perform rebase with --update-ref, and enhance UI around it

Use case solved :
- you work on a big feature, and you have to split your work into multiple PRs. You have therefore many branches and Pull requests based on each other (also called chained PR, PR trains).
- You are working with a git flow where you occasionally need to rebase/squash/force-push to integrate fixes in your feature branches before merging them

The problem : Suppose you need to fix a bug on the very first branch with a rebase on the original commit, you'd have to also rebase all other branches. --update-ref allows to do this once

Additional enhancements possible : the smartgit UI could tell you which other branches had their refs updated, and suggest to push them as well. It is unsure if this is always the desired behavior (for example If you are working with a teammate on this PR-train, and you need to better co-ordinate) 

Original message : 

I just discovered this feature from git called --update ref released actually a couple years ago in 2022

https://github.blog/open-source/git/highlights-from-git-2-38/#rebase-dependent-branches-with-update-refs

https://medium.com/@bruce.ho98/a-better-way-to-rebase-stacked-prs-aa9b4dc600f1

I was wondering if this is something that could be introduced to Smartgit ? It could be either silently (just applying the parameter) or even better, having some UI feedback about the list of other updated branches, along with support regarding pushing all those branches.

It could be a killer feature for teams committed to making small PRs and often needing to cascade them.

Notes : there are some tools that seem to provide similar behavior to rebase --update-refs available online like https://github.com/realyze/pr-train

Best,

Cyril

It would be really helpful to me if there were a simpler way to check out PRs and/or their branches to a worktree subdir of the current clone. IMO, this would be most discoverable as a right-click option nest to "Check Out...", as in "Check Out to new Worktree...". This right-click option could be made available on any branch selection, or even any commit selection context where "Check Out..." is offered.

I can't emphasise how many times per day I fight this issue: I change something in my editor, double-click in Smartgit to see the differences and I realise that tab settings is wrong. So I go to View -> Settings and adjust it. Yet again. Sure, I can save it as default but that works only until I switch to another repository.

How much easier my life would be if Smartgit read .editorconfig (https://editorconfig.org) from given repository!

Standard Window has the option for double-clicking of a local file to stage or unstage changes for that file. Please add that same option for Log and Working Tree windows. Thanks!

Those of us who are colorblind would find it useful to be able to set custom colors for "red", "yellow", and "green" messages in the Output log.  With tiny icons on a 4K monitor, it is easy to overlook a failed operation.  

When i have the diff window open, and open the Find window it's modal so i can't scroll or interact with the window. It would be good if it were "stay on top" but non-modal.

Hello guys. 

I have been using SmartGit for years. The longer I use it the more I love it. But also I am getting used to click 'commit and push' button pretty quickly and automatically. Keeping in mind that I shouldn't do that and that I have to verify my commits before pushing, I cannot stop. 

So I ask you to add an option to disable or even hide this button. I would be happy to free-willy disable it which would force me to split the process into two steps: commit, then push. 

Hope to see this feature soon since it's not so hard to implement and also it's not a big impact for the ones who disagree.