From 190767f6c15edef430498a10356cb6d573934e7a Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Tue, 8 Mar 2011 09:31:25 +0100 Subject: [PATCH 1/2] 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 + Documentation/rev-list-options.txt | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) 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 diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt index 9c47ad885b..46b7e64c8b 100644 --- a/Documentation/rev-list-options.txt +++ b/Documentation/rev-list-options.txt @@ -158,7 +158,8 @@ Commit Limiting Besides specifying a range of commits that should be listed using the special notations explained in the description, additional commit -limiting may be applied. +limiting may be applied. Note that they are applied before commit +ordering and formatting options, such as '--reverse'. -- From f98fd4367542b507c18b6aeb4ac0c824dec4b7b3 Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Tue, 8 Mar 2011 09:31:26 +0100 Subject: [PATCH 2/2] 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 | 12 +- Documentation/rev-list-options.txt | 310 ++++++++++++++--------------- 2 files changed, 161 insertions(+), 161 deletions(-) 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. -Common diff options -~~~~~~~~~~~~~~~~~~~ - -:git-log: 1 -include::diff-options.txt[] - include::rev-list-options.txt[] include::pretty-formats.txt[] +Common diff options +------------------- + +:git-log: 1 +include::diff-options.txt[] + include::diff-generate-patch.txt[] Examples diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt index 46b7e64c8b..09860de9c2 100644 --- a/Documentation/rev-list-options.txt +++ b/Documentation/rev-list-options.txt @@ -1,158 +1,3 @@ -Commit Formatting -~~~~~~~~~~~~~~~~~ - -ifdef::git-rev-list[] -Using these options, linkgit:git-rev-list[1] will act similar to the -more specialized family of commit log tools: linkgit:git-log[1], -linkgit:git-show[1], and linkgit:git-whatchanged[1] -endif::git-rev-list[] - -include::pretty-options.txt[] - ---relative-date:: - - Synonym for `--date=relative`. - ---date=(relative|local|default|iso|rfc|short|raw):: - - Only takes effect for dates shown in human-readable format, such - as when using "--pretty". `log.date` config variable sets a default - value for log command's --date option. -+ -`--date=relative` shows dates relative to the current time, -e.g. "2 hours ago". -+ -`--date=local` shows timestamps in user's local timezone. -+ -`--date=iso` (or `--date=iso8601`) shows timestamps in ISO 8601 format. -+ -`--date=rfc` (or `--date=rfc2822`) shows timestamps in RFC 2822 -format, often found in E-mail messages. -+ -`--date=short` shows only date but not time, in `YYYY-MM-DD` format. -+ -`--date=raw` shows the date in the internal raw git format `%s %z` format. -+ -`--date=default` shows timestamps in the original timezone -(either committer's or author's). - -ifdef::git-rev-list[] ---header:: - - Print the contents of the commit in raw-format; each record is - separated with a NUL character. -endif::git-rev-list[] - ---parents:: - - Print also the parents of the commit (in the form "commit parent..."). - Also enables parent rewriting, see 'History Simplification' below. - ---children:: - - Print also the children of the commit (in the form "commit child..."). - Also enables parent rewriting, see 'History Simplification' below. - -ifdef::git-rev-list[] ---timestamp:: - Print the raw commit timestamp. -endif::git-rev-list[] - ---left-right:: - - Mark which side of a symmetric diff a commit is reachable from. - Commits from the left side are prefixed with `<` and those from - the right with `>`. If combined with `--boundary`, those - commits are prefixed with `-`. -+ -For example, if you have this topology: -+ ------------------------------------------------------------------------ - y---b---b branch B - / \ / - / . - / / \ - o---x---a---a branch A ------------------------------------------------------------------------ -+ -you would get an output like this: -+ ------------------------------------------------------------------------ - $ git rev-list --left-right --boundary --pretty=oneline A...B - - >bbbbbbb... 3rd on b - >bbbbbbb... 2nd on b - `. If combined with `--boundary`, those + commits are prefixed with `-`. ++ +For example, if you have this topology: ++ +----------------------------------------------------------------------- + y---b---b branch B + / \ / + / . + / / \ + o---x---a---a branch A +----------------------------------------------------------------------- ++ +you would get an output like this: ++ +----------------------------------------------------------------------- + $ git rev-list --left-right --boundary --pretty=oneline A...B + + >bbbbbbb... 3rd on b + >bbbbbbb... 2nd on b +