Code

diff-format.txt: Combined diff format documentation supplement
authorJakub Narebski <jnareb@gmail.com>
Thu, 26 Oct 2006 03:44:49 +0000 (05:44 +0200)
committerJunio C Hamano <junkio@cox.net>
Thu, 26 Oct 2006 07:15:01 +0000 (00:15 -0700)
commit0074aba1c0d3b073c635fdc1d5754dc6a6b6b7b9
tree69a45316f567395396b428214ceade2e9e151744
parentd9c04ba3ddd0945ef18657a2a373c5edfe86ef7c
diff-format.txt: Combined diff format documentation supplement

Update example combined diff format to the current version
$ git diff-tree -p -c fec9ebf16c948bcb4a8b88d0173ee63584bcde76
and provide complete first chunk in example.

Document combined diff format headers: how "diff header" look like,
which of "extended diff headers" are used with combined diff and how
they look like, differences in two-line from-file/to-file header from
non-combined diff format, chunk header format.

It should be noted that combined diff format was designed for quick
_content_ inspection and renames would work correctly to pick which
blobs from each tree to compare but otherwise not reflected in the
output (the pathnames are not shown).

[jc: with minimum copyediting]

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Documentation/diff-format.txt