Jonathan Nieder <jrnieder@xxxxxxxxx> wrote: > Stefan Haller wrote: > > > Most of the diff related options are > > ones that I want to toggle with one click. That's certainly true for > > "Ignore space change", "First parent", and the "Diff/Old Version/New > > Version" radio buttons. I would hate to see any of them be removed from > > the diff pane. > > Thanks, that's useful information. Could you give example workflows > to illustrate this? When browsing history, I usually have "First parent" off, so that I see empty diffs for most merges, except the ones that had conflicts. Occasionally though, when looking at a merge of a larger branch, I want to see what changes were introduced by the merge; turning on "First parent" allows me to quickly see that, or in general gives me an idea of just how "big" the merge was. I usually turn it back off right afterwards. Similar for "Ignore space change": I usually have it off most of the time, so that I see faithful diffs. Occasionally, when just the indentation of a block of C code has changed, I turn it on just for that one diff to make it easier to read; then I turn it back off right afterwards. Also similar for "Lines of context": this is usually set to a medium value, like 3 or 4; sometimes I'll increase it to 12 or more for a single diff to see more of the surrounding code, and sometimes I'll set it to 1 for a merge diff with hunks so close to each other that they otherwise show as conflicts. Your proposal of having presets for diff options has the drawback that I would need a preset for each combination of these options. -Stefan -- 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