0
Completed

Log graph: Collapse all octopus-merge branches

Sync 3 years ago updated by Marc Strapetz 3 years ago 3

I love how we are able to collapse merge-commits now, but it doesn't seem to handle octopus merge `git merge -no-ff branch1 branch2 ...`.  It only collapses one of the branches.

Are you referring to the Log Graph's Follow Only First Parent option? If so, I can't reproduce this problem. Please send some small test repository for which the problem is reproducible to smartgit@syntevo.com.

I see the "problem" now. If there are branches in one of the octopus legs, and if the branch is checked in [Branches], the leg won't be collapsed.  I was able to collapse all legs by unchecking all branches.

Completed

This behavior is expected.