From: Junio C Hamano Date: Thu, 8 Nov 2007 08:07:45 +0000 (+0000) Subject: Autogenerated HTML docs for v1.5.3.5-602-g53d1 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=422cfec2c3b3d56e9bc47f8e3e0fa10502768dd3;p=git.git Autogenerated HTML docs for v1.5.3.5-602-g53d1 --- diff --git a/RelNotes-1.5.3.5.txt b/RelNotes-1.5.3.5.txt index f99a2cd65..7ff1d5d0d 100644 --- a/RelNotes-1.5.3.5.txt +++ b/RelNotes-1.5.3.5.txt @@ -90,5 +90,5 @@ Fixes since v1.5.3.4 * "git-send-pack $remote frotz" segfaulted when there is nothing named 'frotz' on the local end. - * "git-rebase -interactive" did not handle its "--strategy" option + * "git-rebase --interactive" did not handle its "--strategy" option properly. diff --git a/RelNotes-1.5.4.txt b/RelNotes-1.5.4.txt index 133fa64d2..65dd1b0a2 100644 --- a/RelNotes-1.5.4.txt +++ b/RelNotes-1.5.4.txt @@ -46,6 +46,9 @@ Updates since v1.5.3 * Various Perforce importer updates. + * git-lost-found was deprecated in favor of git-fsck's --lost-found + option. + Fixes since v1.5.3 ------------------ diff --git a/config.txt b/config.txt index 0df004ea2..8d5d20058 100644 --- a/config.txt +++ b/config.txt @@ -345,8 +345,8 @@ branch..mergeoptions:: supported. clean.requireForce:: - A boolean to make git-clean do nothing unless given -f or -n. Defaults - to false. + A boolean to make git-clean do nothing unless given -f + or -n. Defaults to true. color.branch:: A boolean to enable/disable color in the output of diff --git a/git-config.html b/git-config.html index 662d72453..4e5ceddd9 100644 --- a/git-config.html +++ b/git-config.html @@ -1132,8 +1132,8 @@ clean.requireForce

- A boolean to make git-clean do nothing unless given -f or -n. Defaults - to false. + A boolean to make git-clean do nothing unless given -f + or -n. Defaults to true.

@@ -1956,7 +1956,7 @@ transfer.unpackLimit diff --git a/git-lost-found.html b/git-lost-found.html index e4096b94a..b29fde6c0 100644 --- a/git-lost-found.html +++ b/git-lost-found.html @@ -276,6 +276,8 @@ git-lost-found(1) Manual Page

DESCRIPTION

+

NOTE: this command is deprecated. Use git-fsck(1) with +the option --lost-found instead.

Finds dangling commits and tags from the object database, and creates refs to them in the .git/lost-found/ directory. Commits and tags that dereference to commits are stored in .git/lost-found/commit, @@ -338,7 +340,7 @@ $ git rev-parse not-lost-anymore

diff --git a/git-lost-found.txt b/git-lost-found.txt index bc739117b..7f808fcd7 100644 --- a/git-lost-found.txt +++ b/git-lost-found.txt @@ -11,6 +11,10 @@ SYNOPSIS DESCRIPTION ----------- + +*NOTE*: this command is deprecated. Use gitlink:git-fsck[1] with +the option '--lost-found' instead. + Finds dangling commits and tags from the object database, and creates refs to them in the .git/lost-found/ directory. Commits and tags that dereference to commits are stored in .git/lost-found/commit, diff --git a/git-reset.html b/git-reset.html index 7b334cdb8..77803c1ef 100644 --- a/git-reset.html +++ b/git-reset.html @@ -273,8 +273,8 @@ git-reset(1) Manual Page

SYNOPSIS

-
git-reset [--mixed | --soft | --hard] [<commit>] -git-reset [--mixed] <commit> [--] <paths>…
+
git-reset [--mixed | --soft | --hard] [-q] [<commit>] +git-reset [--mixed] [-q] <commit> [--] <paths>…

DESCRIPTION

@@ -323,6 +323,14 @@ the index from a given commit, without moving HEAD.

+-q +
+
+

+ Be quiet, only report errors. +

+
+
<commit>
@@ -567,7 +575,7 @@ At this point the index file still has all the WIP changes you diff --git a/git-reset.txt b/git-reset.txt index 87afa6f8d..050e4eadb 100644 --- a/git-reset.txt +++ b/git-reset.txt @@ -8,8 +8,8 @@ git-reset - Reset current HEAD to the specified state SYNOPSIS -------- [verse] -'git-reset' [--mixed | --soft | --hard] [] -'git-reset' [--mixed] [--] ... +'git-reset' [--mixed | --soft | --hard] [-q] [] +'git-reset' [--mixed] [-q] [--] ... DESCRIPTION ----------- @@ -45,6 +45,9 @@ OPTIONS switched to. Any changes to tracked files in the working tree since are lost. +-q:: + Be quiet, only report errors. + :: Commit to make the current HEAD. diff --git a/git-send-email.html b/git-send-email.html index 7f70bdb4f..49ee64e72 100644 --- a/git-send-email.html +++ b/git-send-email.html @@ -451,8 +451,7 @@ enabled interface to provide the necessary information.

- If this is set, do not add the From: address to the cc: list, if it - shows up in a From: line. + If this is set, do not add the From: address to the cc: list. Default is the value of sendemail.suppressfrom configuration value; if that is unspecified, default to --no-suppress-from.

@@ -617,7 +616,7 @@ send_lots_of_email.pl by Greg Kroah-Hartman.

diff --git a/git-send-email.txt b/git-send-email.txt index e38b7021b..659215ac7 100644 --- a/git-send-email.txt +++ b/git-send-email.txt @@ -113,8 +113,7 @@ The --cc option must be repeated for each user you want on the cc list. is not set, this will be prompted for. --suppress-from, --no-suppress-from:: - If this is set, do not add the From: address to the cc: list, if it - shows up in a From: line. + If this is set, do not add the From: address to the cc: list. Default is the value of 'sendemail.suppressfrom' configuration value; if that is unspecified, default to --no-suppress-from.