Derrick Stolee <stolee@xxxxxxxxx> writes: > Then I suppose we should focus on naming merge commits with this property: > > A merge commit that is not TREESAME to its first parent (but is TREESAME > to a later parent). > > The part in parentheses may be optional, because a merge commit that is > not TREESAME to any parent will be included by every history mode. A merge that is TREESAME to its first parent does not introduce anything new to the mainline (as far as the paths that match the pathspec are concerned). We are trying to find names to call merges that are not those no-op merges. Hmph... > In my latest attempt at documentation, I called these merges "diverters" > yet still used "--include-diversions". Here are a few other words that we > could use: > > * diverters or diversions > * redirects > * switches (think railroad switch). Synonym: exchange > * detours ...none of the above tells me that they are not no-op (in other words, they do something meaningful), so I must be coming from a direction different from you are. What redirects from what other thing, for example?
