From 190767f6c15edef430498a10356cb6d573934e7a Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Tue, 8 Mar 2011 09:31:25 +0100 Subject: git-log.txt,rev-list-options.txt: -n/--max-count is commit limiting They are applied after commit ordering and formatting options, in particular --reverse. Signed-off-by: Michael J Gruber Signed-off-by: Junio C Hamano --- Documentation/git-log.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'Documentation/git-log.txt') diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt index ff41784c60..48c1715126 100644 --- a/Documentation/git-log.txt +++ b/Documentation/git-log.txt @@ -25,6 +25,7 @@ OPTIONS -:: Limits the number of commits to show. + Note that this is a commit limiting option, see below. ..:: Show only commits between the named two commits. When -- cgit v1.2.3 From f98fd4367542b507c18b6aeb4ac0c824dec4b7b3 Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Tue, 8 Mar 2011 09:31:26 +0100 Subject: git-log.txt,rev-list-options.txt: put option blocks in proper order Match the order of the description to the one in which they get applied: commit limiting commit ordering commit formatting diff options Signed-off-by: Michael J Gruber Signed-off-by: Junio C Hamano --- Documentation/git-log.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'Documentation/git-log.txt') diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt index 48c1715126..c43aa438c7 100644 --- a/Documentation/git-log.txt +++ b/Documentation/git-log.txt @@ -73,16 +73,16 @@ produced by --stat etc. to be prefixed with "\-- " to separate them from options or refnames. +include::rev-list-options.txt[] + +include::pretty-formats.txt[] + Common diff options -~~~~~~~~~~~~~~~~~~~ +------------------- :git-log: 1 include::diff-options.txt[] -include::rev-list-options.txt[] - -include::pretty-formats.txt[] - include::diff-generate-patch.txt[] Examples -- cgit v1.2.3 From 48bb914ed641fc0880d86b16cbb17c84769c320a Mon Sep 17 00:00:00 2001 From: Jeff King Date: Fri, 11 Mar 2011 00:52:08 -0500 Subject: doc: drop author/documentation sections from most pages The point of these sections is generally to: 1. Give credit where it is due. 2. Give the reader an idea of where to ask questions or file bug reports. But they don't do a good job of either case. For (1), they are out of date and incomplete. A much more accurate answer can be gotten through shortlog or blame. For (2), the correct contact point is generally git@vger, and even if you wanted to cc the contact point, the out-of-date and incomplete fields mean you're likely sending to somebody useless. So let's drop the fields entirely from all manpages except git(1) itself. We already point people to the mailing list for bug reports there, and we can update the Authors section to give credit to the major contributors and point to shortlog and blame for more information. Each page has a "This is part of git" footer, so people can follow that to the main git manpage. --- Documentation/git-log.txt | 8 -------- 1 file changed, 8 deletions(-) (limited to 'Documentation/git-log.txt') diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt index ff41784c60..7fb842334f 100644 --- a/Documentation/git-log.txt +++ b/Documentation/git-log.txt @@ -181,14 +181,6 @@ This setting can be disabled by the `--no-standard-notes` option, overridden by the 'GIT_NOTES_DISPLAY_REF' environment variable, and supplemented by the `--show-notes` option. -Author ------- -Written by Linus Torvalds - -Documentation --------------- -Documentation by David Greaves, Junio C Hamano and the git-list . - GIT --- Part of the linkgit:git[1] suite -- cgit v1.2.3