Ed Hutchins <eh@xxxxxxxxxxxx> writes: > I might be able to switch our corporate workflow to adding non-ff merge > commits, but the reason we moved away from using github's big red button > in the first place was to avoid the extra noise of merge-only commits. > > Actually you've pointed out an inconsistency: why is it okay for merge > commits to automatically mention branch names, but for regular commits > this is considered harmful? We do not care what you write as part of human-readable payload. Your local convention could be to add, near the end of your log messages, "Made-on-branch: frotz" line, just like all the commits in our project have "Signed-off-by: line" at the end. The problem we avoid is to add it as structural part of the commit object. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html