user/sven/git.git/Documentation/diff-generate-patch.txt, branch v1.7.6.3

diff format documentation: clarify --cc and -c

2011-03-08T22:44:07Z

The description was unclear if -c or --cc was the default (--cc is for some commands), and incorrectly implied that the default applies to all the diff generating commands. Most importantly, "log" does not default to "--cc" (it defaults to "--no-merges") and "log -p" obeys the user's wish to see non-combined format. Only "diff" (during merge and three-blob comparison) and "show" use --cc as the default. Signed-off-by: Adam Monsen Signed-off-by: Junio C Hamano

Clarify and extend the "git diff" format documentation

2010-10-19T21:15:30Z

Move the similarity and dissimilarity index header description closer to where those extended headers are described. Describe and/or clarify the format used for file modes, pathnames, and the index header. Document that all "old" files refer to the state before applying the *entire* output, and all "new" files refer to the state thereafter. Signed-off-by: Andreas Gruenbacher Signed-off-by: Junio C Hamano

git log -p -m: document -m and honor --first-parent

2010-02-12T19:32:23Z

git log -p -m is used to show one merge entry per parent, with an appropriate diff; this can be useful when examining histories where full set of changes introduced by a merged branch is interesting, not only the conflicts. This patch properly documents the -m switch, which has so far been mentioned only as a fairly special diff-tree flag. It also makes the code show full patch entry only for the first parent when --first-parent is used. Thus: git log -p -m --first-parent will show the history from the "main branch perspective", while also including full diff of changes introduced by other merged in branches. Signed-off-by: Petr Baudis Signed-off-by: Junio C Hamano

Documentation: fix typos, grammar, asciidoc syntax

2008-12-20T03:10:46Z

Signed-off-by: Markus Heidelberg Signed-off-by: Junio C Hamano

git-diff(1): "--c" -> "--cc" typo fix

2008-07-22T02:17:23Z

git diff does not take a --c option. Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano

Include diff options in the git-log manpage

2007-12-05T09:57:40Z

[jc: with quite a few fixups] Signed-off-by: Miklos Vajna Signed-off-by: Junio C Hamano