4 commits

Author	SHA1	Message	Date
Petr Baudis	88d9d45d07	git log -p -m: document -m and honor --first-parent ... 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 <pasky@suse.cz> Signed-off-by: Junio C Hamano <gitster@pobox.com>	2010-02-12 11:32:23 -08:00
Markus Heidelberg	04c8ce9c1c	Documentation: fix typos, grammar, asciidoc syntax ... Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>	2008-12-19 19:10:46 -08:00
Jonathan Nieder	e57c817d9f	git-diff(1): "--c" -> "--cc" typo fix ... git diff does not take a --c option. Signed-off-by: Jonathan Nieder <jrnieder@uchicago.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>	2008-07-21 19:17:23 -07:00
Miklos Vajna	272bd3cfd0	Include diff options in the git-log manpage ... [jc: with quite a few fixups] Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>	2007-12-05 01:57:40 -08:00