From 5d1faf8791fa85ba9be2282900d4f704c7790648 Mon Sep 17 00:00:00 2001 From: Chris Riddoch Date: Tue, 21 Nov 2006 16:49:15 -0700 Subject: Move --pretty options into Documentation/pretty-formats.txt Asciidoc-include it into the manuals for programs that use the --pretty command-line option, for consistency among the docs. This describes all the pretty-formats currently listed in the cmit_fmt enum in commit.h, and also briefly describes the presence and format of the 'Merge: ' line in some pretty formats. There's a hedge that limiting your view of history can affect what goes in the Merge: line, and that --abbrev/--no-abbrev do nothing to the 'raw' format. Signed-off-by: Chris Riddoch Signed-off-by: Junio C Hamano --- Documentation/git-log.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Documentation/git-log.txt') diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt index c9ffff734c..79643ac928 100644 --- a/Documentation/git-log.txt +++ b/Documentation/git-log.txt @@ -24,8 +24,8 @@ This manual page describes only the most frequently used options. OPTIONS ------- ---pretty=:: - Controls the way the commit log is formatted. + +include::pretty-formats.txt[] --max-count=:: Limits the number of commits to show. -- cgit v1.2.3 From 5dc7bcc2453ce854dc1192cfffcc8aee1cc3b69d Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 30 Dec 2006 02:22:38 -0800 Subject: Documentation: i18n commit log message notes. Signed-off-by: Junio C Hamano --- Documentation/git-log.txt | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'Documentation/git-log.txt') diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt index 79643ac928..c87133542a 100644 --- a/Documentation/git-log.txt +++ b/Documentation/git-log.txt @@ -63,6 +63,12 @@ git log -r --name-status release..test:: in the "release" branch, along with the list of paths each commit modifies. +Discussion +---------- + +include::i18n.txt[] + + Author ------ Written by Linus Torvalds -- cgit v1.2.3 From 99e09cce8d0eace48209483b07e2a9d99542bd04 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 30 Dec 2006 02:21:48 -0800 Subject: Documentation: minor rewording for git-log and git-show pages. Signed-off-by: Junio C Hamano --- Documentation/git-log.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Documentation/git-log.txt') diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt index c87133542a..e9f746bbd4 100644 --- a/Documentation/git-log.txt +++ b/Documentation/git-log.txt @@ -31,7 +31,9 @@ include::pretty-formats.txt[] Limits the number of commits to show. ..:: - Show only commits between the named two commits. + Show only commits between the named two commits. When + either or is omitted, it defaults to + `HEAD`, i.e. the tip of the current branch. -p:: Show the change the commit introduces in a patch form. -- cgit v1.2.3