delta/git.git - github.com: git/git.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	diff: recurse into nested submodules for inline diffjk/diff-submodule-diff-inline	Stefan Beller	2017-05-08	1	-0/+41
\| \| \| \| \| \| \| \| \| \| \| \| \|	When fd47ae6a5b (diff: teach diff to display submodule difference with an inline diff, 2016-08-31) was introduced, we did not think of recursing into nested submodules. When showing the inline diff for submodules, automatically recurse into nested submodules as well with inline submodule diffs. Signed-off-by: Stefan Beller <sbeller@google.com> Acked-by: Jacob Keller <jacob.keller@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
*	diff: teach diff to display submodule difference with an inline diff	Jacob Keller	2016-08-31	1	-0/+749
	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>