From: Junio C Hamano Date: Thu, 13 Dec 2007 02:45:30 +0000 (+0000) Subject: Autogenerated HTML docs for v1.5.4-rc0 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0c0da5f5e8189bd157b6bd4ab1a532bb1d4c80d9;p=git.git Autogenerated HTML docs for v1.5.4-rc0 --- diff --git a/RelNotes-1.5.4.txt b/RelNotes-1.5.4.txt index 7386e66dc..6645565c5 100644 --- a/RelNotes-1.5.4.txt +++ b/RelNotes-1.5.4.txt @@ -246,12 +246,27 @@ Updates since v1.5.3 descriptive name from From: and Signed-off-by: lines in the commit message. + * "git svn" wasted way too much disk to record revision mappings + between svn and git; a new representation that is much more compact + for this information has been introduced to correct this. + * "git status" from a subdirectory now shows relative paths, which makes copy-and-pasting for git-checkout/git-add/git-rm easier. The traditional behaviour to show the full path relative to the top of the work tree can be had by setting status.relativepaths configuration variable to true. + * "git blame" kept text for each annotated revision in core needlessly; + this has been corrected. + + * "git shortlog" learned to default to HEAD when the standard input is + a terminal and the user did not give any revision parameter. + + * "git shortlog" learned "-e" option to show e-mail addresses as well as + authors' names. + + * "git help" learned "-w" option to show documentation in browsers. + * In addition there are quite a few internal clean-ups. Notably - many fork/exec have been replaced with run-command API, @@ -279,6 +294,6 @@ series. -- exec >/var/tmp/1 -O=v1.5.3.7-1148-gcf7e147 +O=v1.5.4-rc0 echo O=`git describe refs/heads/master` git shortlog --no-merges $O..refs/heads/master ^refs/heads/maint diff --git a/git-help.html b/git-help.html index 629264490..b58cd0deb 100644 --- a/git-help.html +++ b/git-help.html @@ -272,7 +272,7 @@ git-help(1) Manual Page

SYNOPSIS

-

git help [-a|--all] [COMMAND]

+

git help [-a|--all|-i|--info|-w|--web] [COMMAND]

DESCRIPTION

@@ -282,7 +282,8 @@ on the standard output.

If the option --all or -a is given, then all available commands are printed on the standard output.

If a git command is named, a manual page for that command is brought -up. The man program is used by default for this purpose.

+up. The man program is used by default for this purpose, but this +can be overriden by other options.

Note that git --help … is identical as git help … because the former is internally converted into the latter.

@@ -298,6 +299,35 @@ former is internally converted into the latter.

option superseeds any other option.

+
+-i|--info +
+
+

+ Use the info program to display the manual page, instead of + the man program that is used by default. +

+
+
+-w|--web +
+
+

+ Use a web browser to display the HTML manual page, instead of + the man program that is used by default. +

+

The web browser can be specified using the configuration variable +help.browser, or web.browser if the former is not set. If none of +these config variables is set, the git-browse-help script (called by +git-help) will pick a suitable default.

+

You can explicitly provide a full path to your prefered browser by +setting the configuration variable browser.<tool>.path. For example, +you can configure the absolute path to firefox by setting +browser.firefox.path. Otherwise, git-browse-help assumes the tool +is available in PATH.

+

Note that the script tries, as much as possible, to display the HTML +page in a new tab on an already opened browser.

+

Author

@@ -317,7 +347,7 @@ little. Maintenance is done by the git-list <git@vger.kernel.org>.

diff --git a/git-help.txt b/git-help.txt index 7ddbf467d..ac9e15d77 100644 --- a/git-help.txt +++ b/git-help.txt @@ -7,7 +7,7 @@ git-help - display help information about git SYNOPSIS -------- -'git help' [-a|--all] [COMMAND] +'git help' [-a|--all|-i|--info|-w|--web] [COMMAND] DESCRIPTION ----------- @@ -20,7 +20,8 @@ If the option '--all' or '-a' is given, then all available commands are printed on the standard output. If a git command is named, a manual page for that command is brought -up. The 'man' program is used by default for this purpose. +up. The 'man' program is used by default for this purpose, but this +can be overriden by other options. Note that 'git --help ...' is identical as 'git help ...' because the former is internally converted into the latter. @@ -28,10 +29,31 @@ former is internally converted into the latter. OPTIONS ------- -a|--all:: - Prints all the available commands on the standard output. This option superseeds any other option. +-i|--info:: + Use the 'info' program to display the manual page, instead of + the 'man' program that is used by default. + +-w|--web:: + Use a web browser to display the HTML manual page, instead of + the 'man' program that is used by default. ++ +The web browser can be specified using the configuration variable +'help.browser', or 'web.browser' if the former is not set. If none of +these config variables is set, the 'git-browse-help' script (called by +'git-help') will pick a suitable default. ++ +You can explicitly provide a full path to your prefered browser by +setting the configuration variable 'browser..path'. For example, +you can configure the absolute path to firefox by setting +'browser.firefox.path'. Otherwise, 'git-browse-help' assumes the tool +is available in PATH. ++ +Note that the script tries, as much as possible, to display the HTML +page in a new tab on an already opened browser. + Author ------ Written by Junio C Hamano and the git-list diff --git a/git-instaweb.html b/git-instaweb.html index 21b6cdc71..9531a109a 100644 --- a/git-instaweb.html +++ b/git-instaweb.html @@ -375,6 +375,8 @@ repository.

modulepath = /usr/lib/apache2/modules +

If the configuration variable instaweb.browser is not set, +web.browser will be used instead if it is defined.

Author

@@ -390,7 +392,7 @@ repository.

diff --git a/git-instaweb.txt b/git-instaweb.txt index 735008c1a..d2ce7790e 100644 --- a/git-instaweb.txt +++ b/git-instaweb.txt @@ -71,6 +71,9 @@ You may specify configuration in your .git/config ----------------------------------------------------------------------- +If the configuration variable 'instaweb.browser' is not set, +'web.browser' will be used instead if it is defined. + Author ------ Written by Eric Wong diff --git a/git-shortlog.html b/git-shortlog.html index 1520e34a2..cff79738f 100644 --- a/git-shortlog.html +++ b/git-shortlog.html @@ -273,8 +273,8 @@ git-shortlog(1) Manual Page

SYNOPSIS

-
git-log --pretty=short | git-shortlog [-h] [-n] [-s] -git-shortlog [-n|--numbered] [-s|--summary] [<committish>…]
+
git-log --pretty=short | git-shortlog [-h] [-n] [-s] [-e] +git-shortlog [-n|--numbered] [-s|--summary] [-e|--email] [<committish>…]

DESCRIPTION

@@ -311,6 +311,14 @@ the first line of the commit message will be shown.

Suppress commit description and provide a commit count summary only.

+
+-e, --email +
+
+

+ Show the email address of each author. +

+

FILES

@@ -344,7 +352,7 @@ Eve Jones <eve@laptop.(none)> diff --git a/git-shortlog.txt b/git-shortlog.txt index 2220ef6ea..e14720b73 100644 --- a/git-shortlog.txt +++ b/git-shortlog.txt @@ -8,8 +8,8 @@ git-shortlog - Summarize 'git log' output SYNOPSIS -------- [verse] -git-log --pretty=short | 'git-shortlog' [-h] [-n] [-s] -git-shortlog [-n|--numbered] [-s|--summary] [...] +git-log --pretty=short | 'git-shortlog' [-h] [-n] [-s] [-e] +git-shortlog [-n|--numbered] [-s|--summary] [-e|--email] [...] DESCRIPTION ----------- @@ -32,6 +32,9 @@ OPTIONS -s, \--summary:: Suppress commit description and provide a commit count summary only. +-e, \--email:: + Show the email address of each author. + FILES ----- diff --git a/git.html b/git.html index 0a13e42d5..98342c845 100644 --- a/git.html +++ b/git.html @@ -316,6 +316,10 @@ documentation can be viewed at available commands are printed. If a git command is named this option will bring up the manual page for that command.

+

Other options are available to control how the manual page is +displayed. See git-help(1) for more information, +because git --help … is converted internally into git +help ….

--exec-path @@ -1941,7 +1945,7 @@ contributors on the git-list <git@vger.kernel.org>.

diff --git a/git.txt b/git.txt index 1574ecd77..a29b634e7 100644 --- a/git.txt +++ b/git.txt @@ -104,6 +104,11 @@ OPTIONS commands. If the option '--all' or '-a' is given then all available commands are printed. If a git command is named this option will bring up the manual page for that command. ++ +Other options are available to control how the manual page is +displayed. See gitlink:git-help[1] for more information, +because 'git --help ...' is converted internally into 'git +help ...'. --exec-path:: Path to wherever your core git programs are installed.