This seems to be equivalent to Git-Flow AVH option "gitflow.feature.finish.push" and will be implemented as part of  https://smartgit.userecho.com/communities/1/topics/409-

AFAIU, this is exactly what Git-Flow AVH option"gitflow.feature.finish.rebase" does?

Regarding ahead/behind, I agree that for remote branches this will work fine. I'm not sure whether it's a good idea to do that only for Remote branches and continue displaying ahead/behind relative to the tracked branch for local branches. Is this actually what you would like to see?

Alternatively, there could be an option whether to display ahead/behind relative to the remote branch or relative to the (remote?) "main" branch for any branch.

For local branches, we also could display this information in addition to the existing ahead/behind.This means that there will be two ahead/behind markers for local tracking branches.

Summarizing, there will be following alternatives:

• ahead/behind relative to tracked branch for local branches, ahead/behind relative to "main" branch for remote branches
• ahead/behind relative to "main" branch for all branches
• ahead/behind relative to tracked branch for local branches, in addition ahead/behing relative to "main" branch for all branches

Can we identify one of these options which is significantly more reasonable than the others? Otherwise, we might better have radio options for all alternatives.

Displaying additional Feature, ... categories under "origin" would be a separate RFE -- personally I don't like this deep kind of hierarchy. But for you it might already be sufficient to deselect Show remote branches in their Git-Flow sections from the Branches view hamburger menu.

How would this play together with current ahead/behind information of local vs. tracking branch?

Will be present in upcoming 19.1 preview.

You may be looking for: https://smartgit.userecho.com/communities/1/topics/368-