On Sat, May 24, 2008 at 06:28:08PM -0700, Junio C Hamano wrote: > Adam Simpkins <adam@xxxxxxxxxxxxxxxx> writes: > > > On Sat, May 24, 2008 at 09:25:30PM +0300, Teemu Likonen wrote: > >> > >> I'd rather show merge commits always with M. They are still conceptually > >> merges even if the current log view shows only one parent. This patch > >> changes symbols * and M to be visual symbols, not logical symbols which > >> I'd prefer. > >> > >> For example user may be interested in finding certain merge but chooses > >> to limit the output with a commit range. It helps if user can always > >> trust the symbols * and M to have this conceptual difference. > > > > Okay. Here's a simple patch to restore the behavior of always printing > > 'M' for merge commits, even if less than 2 parents are shown in the > > graph. > > I have to wonder if that is really necessary. A merge commit, unless you > amend it, always starts with "Merge ...", and I think it is enough clue of > what the particular commit did. Besides, I think letter "M" in the > pictorial part of the graph simply looks rather ugly. > > I would even suggest not to use 'M' at all, whether its parents are > interesting or not. Either way is fine with me; it's just a cosmetic issue. (We could even make it configurable, but that definitely seems like overkill.) -- Adam Simpkins adam@xxxxxxxxxxxxxxxx -- 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