Stephen Boyd <bebarino@xxxxxxxxx> writes: > Its not very easy to understand what heads are being merged given > the current output of an octopus merge. Fix this by replacing the > sha1 with the (usually) better description in GITHEAD_<SHA1>. > > Suggested-by: Jari Aalto <jari.aalto@xxxxxxxxx> > Signed-off-by: Stephen Boyd <bebarino@xxxxxxxxx> > --- > > Maybe this will work? At least it will replace the sha1 with > whatever is given on the command line. This shows what was given from the command line instead of the commit object name. I think it makes sense to not even make this dependent on any option. Also I don't think anybody misses the commit object name in the output---after all, that is all internal to git and is different from what the user gave us anyway (unless the user did give us the full 40-char object name, in which case the value of GITHEAD_<SHA1> would be that name, and we will show it, which is also fine). No, I haven't applied nor run it yet. The above is purely from my cursory reading of the code. Anyway, I'll keep this in my inbox or queue it on 'pu' if I had time. -- 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