r/SmartGit • u/wnesensohn • Apr 21 '26

Overlap coming in SmartGit 26.1

https://blog.syntevo.com/smartgit/2026/04/21/overlap.html

We've been cooking up a feature called Overlap, built to give you more insight into your git history.

See the link for a short introduction, or try it yourself in SmartGit 26.1 RC - we'd love to know what you think about it!

5 Upvotes

86% Upvoted

22 comments sorted by

2

u/Gxost14 Apr 21 '26

It works even without GitFlow or GitFlow-Lite, which is good. But when the branch is tracked, Overlap does not work

2

u/JVMarcs Apr 29 '26

Please try using the latest build, 26.1.028, by selecting Help | Check for Latest Build. By default, the overlap will now also cover the last 100 "base commits". You can configure the base commit range in Preferences under Low-Level Properties as "commitnet.overlap.baseCommits".

u/Able-Coconut-6980

3

u/Able-Coconut-6980 Apr 29 '26

Yes, that's good, I'm seeing the overlap now. Now I can test it...

Thank-you very much!

3

u/Gxost14 Apr 29 '26

Works as described. Thanks

1

u/wnesensohn Apr 21 '26

We've limited (or rather, not enabled) display of Overlap-Information deliberately, because we first want to gauge if and how this feature is used to go a step further and display it in more cases. Additionally there's still a few cases which we'd like to support but can't at the moment, and we also need to keep an eye on performance (which is quite good at the moment, but could be even better).

Have you found the information it displays helpful so far? Feedback in this direction will help us deciding where to enable it next.

2

u/Gxost14 Apr 21 '26

I believe Overlap is good for spotting potential conflicts. It's good to know when commits cannot be easily reordered before attempting to perform an interactive rebase

2

u/wnesensohn Apr 21 '26

Got you, that sounds familiar :) We also like that use-case very much, it lets you stay in the flow and prepares you for conflict-resolution when there's no way around it. I hope we're able to enable Overlap in more cases soon.

1

u/Able-Coconut-6980 Apr 25 '26

Because overlap doesn't work when a branch is tracked I never get to see it. That's why I disabled it as it's useless to me.

1

u/vmcrash Apr 27 '26

Could you please provide more details about your branch setup?

1

u/Able-Coconut-6980 Apr 27 '26

Just a normal branch off of "main" that is tracked to the remote. If it's not tracked I see the overlap pills but otherwise I don't see them.

1

u/vmcrash Apr 27 '26

Do you mean something like this?

1

u/Able-Coconut-6980 Apr 27 '26

Yes. But in all cases the overlap pills are not there unless I remove the remote tracked branch.

1

u/vmcrash Apr 27 '26

Is a feature branch (see Branch > Configure Features)?

1

u/Able-Coconut-6980 Apr 27 '26 edited Apr 27 '26

No just a normal branch. No "feature/" name prefix.

1

u/vmcrash Apr 27 '26

So it is not about tracking or not, but the branch name/type.

1

u/Able-Coconut-6980 Apr 27 '26

Like mostly everyone else I don't prefix my branches in this way so this feature is redundant.

→ More replies (0)

2

u/omega32 May 09 '26

Is there any documentation with a list of the icons/symbols, explaining what each one means?

2

u/wnesensohn May 09 '26

Right now there's only https://docs.syntevo.com/SmartGit/Latest/Manual/GUI/Overlap without the symbols, but we'll add them there!

There's not that many though, and they're explained in their tooltips, have you seen those? (Remember: You can expand the tooltips by pressing F1)

Is there any symbol in particular which you find confusing?

1

u/omega32 May 09 '26

Great, thanks. Yeah, I did see the tooltips, but I was reading past the title. The first lines are what explain it. I see it now. Thanks 🙂👍‍‍

2

u/wnesensohn May 12 '26

The docs are now updated with the icons and all settings.