diff options
| author | Jacob Keller <jacob.keller@gmail.com> | 2016-08-31 23:27:25 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-09-01 01:07:10 (GMT) |
| commit | fd47ae6a5b9cc0cfc56c1f7c43db612d26ca4b75 (patch) | |
| tree | 87f05e2e08d728def4944fdd4914b7c9001583f9 /Documentation/diff-config.txt | |
| parent | 8e6df65015f9a947d9ccca8950c2d60a4600cba2 (diff) | |
| download | git-fd47ae6a5b9cc0cfc56c1f7c43db612d26ca4b75.zip git-fd47ae6a5b9cc0cfc56c1f7c43db612d26ca4b75.tar.gz git-fd47ae6a5b9cc0cfc56c1f7c43db612d26ca4b75.tar.bz2 | |
diff: teach diff to display submodule difference with an inline diff
Teach git-diff and friends a new format for displaying the difference
of a submodule. The new format is an inline diff of the contents of the
submodule between the commit range of the update. This allows the user
to see the actual code change caused by a submodule update.
Add tests for the new format and option.
Signed-off-by: Jacob Keller <jacob.keller@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/diff-config.txt')
| -rw-r--r-- | Documentation/diff-config.txt | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt index d5a5b17..0eded24 100644 --- a/Documentation/diff-config.txt +++ b/Documentation/diff-config.txt @@ -122,10 +122,11 @@ diff.suppressBlankEmpty:: diff.submodule:: Specify the format in which differences in submodules are - shown. The "log" format lists the commits in the range like - linkgit:git-submodule[1] `summary` does. The "short" format - format just shows the names of the commits at the beginning - and end of the range. Defaults to short. + shown. The "short" format just shows the names of the commits + at the beginning and end of the range. The "log" format lists + the commits in the range like linkgit:git-submodule[1] `summary` + does. The "diff" format shows an inline diff of the changed + contents of the submodule. Defaults to "short". diff.wordRegex:: A POSIX Extended Regular Expression used to determine what is a "word" |