Re: Combined diff format documentation
- From
Jakub Narebski <jnareb@gmail.com>
- Date
- Oct 25, 2006, 23:45 UTC
- Message-ID
- <ehost8$go7$1@sea.gmane.org>
- In-Reply-To
- <7vejswkoi4.fsf@assigned-by-dhcp.cox.net>
Junio C Hamano wrote:
Show 10 quoted lines
>> BTW. it is not mentioned in documentation that git diff uses hunk section >> indicator, and what regexp/expression it uses (and is it configurable). >> Not described in documentation. > > If you mean by "hunk section indicator" the output similar to > GNU diff -p option, I think it is not worth mentioning and we > are not ready to mention it yet (we have not etched the > expression in stone). Nobody jumped up and down to say it needs > to be configurable, so it is left undocumented more or less > deliberately.
By the way, I have just checked that combined diff format doesn't have (for unknown reason) "which section" indicator in chunk header. Compare $ git diff-tree -p -m fec9ebf16c948bcb4a8b88d0173ee63584bcde76 and $ git diff-tree -p -c fec9ebf16c948bcb4a8b88d0173ee63584bcde76 (this is the source of example combined diff format in diff-formats.txt which I've found via $ git rev-list --parents HEAD -- describe.c | grep " .* " i.e. finding all merges which included changes to describe.c; there are only two such commits).
-- Jakub Narebski Warsaw, Poland ShadeHawk on #git