Jonathan Nieder <jrnieder@xxxxxxxxx> wrote: > Stefan Haller wrote: > > > Sometimes it's desirable to see what changes were introduced by a > > merge commit, rather than how conflicts were resolved. This adds > > a checkbox which, when turned on, makes gitk show the equivalent > > of "git show --first-parent <commit>" for merge commits. > > To be clear: this is a diff option (like -m but limited to one > parent), not a history traversal option, right? Yes, that's right. There is an existing history traversal option called "Limit to first parent" in the "Edit View" dialog, which can be controlled with the --first-parent command line option. Do you think this will cause confusion? > > I realize this conflicts with Thomas Rast's recent patch to > > add a word-diff dropdown box; things are fighting for space > > in the diff pane header... > > Any ideas for addressing the space shortage? Matthieu made the suggestion of "line-wrapping" the widgets in the diff pane header if it becomes too narrow. I guess this could work; I don't know enough Tcl/Tk to be able to try it out though. -- Stefan Haller Berlin, Germany http://www.haller-berlin.de/ -- 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