From 554da79be4cae87edd4323dd34fce9958e02b5d3 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 27 Dec 2007 03:29:58 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.5.4-rc2 --- RelNotes-1.5.4.txt | 19 ++++++++++++++++++- git-commit.html | 19 +++++++++++++++++-- git-commit.txt | 12 +++++++++++- git-log.html | 10 +++++++--- git-log.txt | 8 ++++++-- git-rev-list.html | 17 ++++++++++++++++- git-rev-list.txt | 10 ++++++++++ 7 files changed, 85 insertions(+), 10 deletions(-) diff --git a/RelNotes-1.5.4.txt b/RelNotes-1.5.4.txt index 528b26f7c..e6fbcdb2e 100644 --- a/RelNotes-1.5.4.txt +++ b/RelNotes-1.5.4.txt @@ -91,6 +91,16 @@ Updates since v1.5.3 * "git diff" Porcelain now respects diff.external configuration, which is another way to specify GIT_EXTERNAL_DIFF. + * "git diff" can be told to use different prefixes other than + "a/" and "b/" e.g. "git diff --src-prefix=l/ --dst-prefix=k/". + + * "git diff" sometimes did not quote paths with funny + characters properly. + + * "git log" (and any revision traversal commands) misbehaved + when --diff-filter is given but was not asked to actually + produce diff. + * HTTP proxy can be specified per remote repository using remote.*.httpproxy configuration, or global http.proxy configuration variable. @@ -208,6 +218,10 @@ Updates since v1.5.3 * "git commit --amend" can amend a merge that does not change the tree from its first parent. + * "git commit" used to unconditionally strip comment lines that + began with '#' and removed excess blank lines. This + behaviour has been made configurable. + * "git commit" has been rewritten in C. * "git stash random-text" does not create a new stash anymore. It was @@ -251,6 +265,9 @@ Updates since v1.5.3 reasonable usability fix and people's scripts shouldn't have been relying on the exact output from "git show" Porcelain anyway. + * "git cvsimport" did not notice errors from underlying "cvsps" + and produced a corrupt import silently. + * "git cvsexportcommit" learned -w option to specify and switch to the CVS working directory. @@ -327,6 +344,6 @@ series. -- exec >/var/tmp/1 -O=v1.5.4-rc0-85-gdbedf97 +O=v1.5.4-rc1-36-g49e6be5 echo O=`git describe refs/heads/master` git shortlog --no-merges $O..refs/heads/master ^refs/heads/maint diff --git a/git-commit.html b/git-commit.html index 927a775f1..d0a6bbea5 100644 --- a/git-commit.html +++ b/git-commit.html @@ -276,7 +276,7 @@ git-commit(1) Manual Page
git-commit [-a | --interactive] [-s] [-v] [-u] [(-c | -C) <commit> | -F <file> | -m <msg> | --amend] [--allow-empty] [--no-verify] [-e] [--author <author>] - [--] [[-i | -o ]<file>…]
+ [--cleanup=<mode>] [--] [[-i | -o ]<file>…]

DESCRIPTION

@@ -420,6 +420,21 @@ that, you can recover from it with git-reset(1).

+--cleanup=<mode> +
+
+

+ This option sets how the commit message is cleaned up. + The <mode> can be one of verbatim, whitespace, strip, + and default. The default mode will strip leading and + trailing empty lines and #commentary from the commit message + only if the message is to be edited. Otherwise only whitespace + removed. The verbatim mode does not change message at all, + whitespace removes just leading/trailing whitespace lines + and strip removes both whitespace and commentary. +

+
+
-e|--edit
@@ -715,7 +730,7 @@ Junio C Hamano <junkio@cox.net>

diff --git a/git-commit.txt b/git-commit.txt index 426138415..96383b654 100644 --- a/git-commit.txt +++ b/git-commit.txt @@ -11,7 +11,7 @@ SYNOPSIS 'git-commit' [-a | --interactive] [-s] [-v] [-u] [(-c | -C) | -F | -m | --amend] [--allow-empty] [--no-verify] [-e] [--author ] - [--] [[-i | -o ]...] + [--cleanup=] [--] [[-i | -o ]...] DESCRIPTION ----------- @@ -95,6 +95,16 @@ OPTIONS from making such a commit. This option bypasses the safety, and is primarily for use by foreign scm interface scripts. +--cleanup=:: + This option sets how the commit message is cleaned up. + The '' can be one of 'verbatim', 'whitespace', 'strip', + and 'default'. The 'default' mode will strip leading and + trailing empty lines and #commentary from the commit message + only if the message is to be edited. Otherwise only whitespace + removed. The 'verbatim' mode does not change message at all, + 'whitespace' removes just leading/trailing whitespace lines + and 'strip' removes both whitespace and commentary. + -e|--edit:: The message taken from file with `-F`, command line with `-m`, and from file with `-C` are usually used as the diff --git a/git-log.html b/git-log.html index 762e8f86a..fc59725ef 100644 --- a/git-log.html +++ b/git-log.html @@ -791,8 +791,12 @@ people using 80-column terminals.

Follow only the first parent commit upon seeing a merge - commit. This option gives a better overview of the - evolution of a particular branch. + commit. This option can give a better overview when + viewing the evolution of a particular topic branch, + because merges into a topic branch tend to be only about + adjusting to updated upstream from time to time, and + this option allows you to ignore the individual commits + brought in to your history by such a merge.

@@ -1473,7 +1477,7 @@ reversible operation.

diff --git a/git-log.txt b/git-log.txt index 5920d1799..d71e51ad4 100644 --- a/git-log.txt +++ b/git-log.txt @@ -43,8 +43,12 @@ include::diff-options.txt[] --first-parent:: Follow only the first parent commit upon seeing a merge - commit. This option gives a better overview of the - evolution of a particular branch. + commit. This option can give a better overview when + viewing the evolution of a particular topic branch, + because merges into a topic branch tend to be only about + adjusting to updated upstream from time to time, and + this option allows you to ignore the individual commits + brought in to your history by such a merge. -g, \--walk-reflogs:: Show commits as they were recorded in the reflog. The log contains diff --git a/git-rev-list.html b/git-rev-list.html index 3f9104e33..5bda7fbbd 100644 --- a/git-rev-list.html +++ b/git-rev-list.html @@ -279,6 +279,7 @@ git-rev-list(1) Manual Page [ --min-age=timestamp ] [ --sparse ] [ --no-merges ] + [ --first-parent ] [ --remove-empty ] [ --full-history ] [ --not ] @@ -623,6 +624,20 @@ limiting may be applied.

+--first-parent +
+
+

+ Follow only the first parent commit upon seeing a merge + commit. This option can give a better overview when + viewing the evolution of a particular topic branch, + because merges into a topic branch tend to be only about + adjusting to updated upstream from time to time, and + this option allows you to ignore the individual commits + brought in to your history by such a merge. +

+
+
--not
@@ -1175,7 +1190,7 @@ and the git-list <git@vger.kernel.org>.

diff --git a/git-rev-list.txt b/git-rev-list.txt index a03f9fe5f..438dae02e 100644 --- a/git-rev-list.txt +++ b/git-rev-list.txt @@ -15,6 +15,7 @@ SYNOPSIS [ \--min-age=timestamp ] [ \--sparse ] [ \--no-merges ] + [ \--first-parent ] [ \--remove-empty ] [ \--full-history ] [ \--not ] @@ -256,6 +257,15 @@ limiting may be applied. Do not print commits with more than one parent. +--first-parent:: + Follow only the first parent commit upon seeing a merge + commit. This option can give a better overview when + viewing the evolution of a particular topic branch, + because merges into a topic branch tend to be only about + adjusting to updated upstream from time to time, and + this option allows you to ignore the individual commits + brought in to your history by such a merge. + --not:: Reverses the meaning of the '{caret}' prefix (or lack thereof) -- 2.26.2