From: Jacob Keller <jacob.keller@xxxxxxxxx> As suggested by Junio, I broke this patch into several pieces, and made a common helper function for the submodule header. Note that there are a couple of complicated modifications to the submodule header portion which (should) still result in the same header but allow the diff format a bit better control. It's a bit awkward but it does pass all the current tests, and the format between the two should be similar. I tried to break apart the patches properly, so I hope I didn't accidentally munge them too badly. Jacob Keller (6): graph: add support for --line-prefix on all graph-aware output diff: prepare for additional submodule formats submodule: allow do_submodule_path to work if given gitdir directly submodule: correct output of submodule log format submodule: refactor show_submodule_summary with helper function diff: teach diff to display submodule difference with an inline diff Junio C Hamano (1): diff.c: remove output_prefix_length field Documentation/diff-config.txt | 9 +- Documentation/diff-options.txt | 20 +- builtin/rev-list.c | 70 +- diff.c | 52 +- diff.h | 11 +- graph.c | 106 +-- graph.h | 22 +- log-tree.c | 5 +- path.c | 4 +- submodule.c | 162 ++++- submodule.h | 6 + t/t4013-diff-various.sh | 6 + ...diff.diff_--line-prefix=abc_master_master^_side | 29 + t/t4013/diff.diff_--line-prefix_--cached_--_file0 | 15 + t/t4059-diff-submodule-option-diff-format.sh | 733 +++++++++++++++++++++ t/t4202-log.sh | 323 +++++++++ 16 files changed, 1432 insertions(+), 141 deletions(-) create mode 100644 t/t4013/diff.diff_--line-prefix=abc_master_master^_side create mode 100644 t/t4013/diff.diff_--line-prefix_--cached_--_file0 create mode 100755 t/t4059-diff-submodule-option-diff-format.sh -- 2.10.0.rc0.217.g609f9e8.dirty -- 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