aboutsummaryrefslogtreecommitdiff
path: root/git-merge-octopus.sh
diff options
context:
space:
mode:
authorJakub Narebski <jnareb@gmail.com>2006-10-26 05:44:49 +0200
committerJunio C Hamano <junkio@cox.net>2006-10-26 00:15:01 -0700
commit0074aba1c0d3b073c635fdc1d5754dc6a6b6b7b9 (patch)
tree69a45316f567395396b428214ceade2e9e151744 /git-merge-octopus.sh
parentd9c04ba3ddd0945ef18657a2a373c5edfe86ef7c (diff)
downloadgit-0074aba1c0d3b073c635fdc1d5754dc6a6b6b7b9.tar.gz
git-0074aba1c0d3b073c635fdc1d5754dc6a6b6b7b9.tar.xz
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>
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions