From 8760ea6311a1c56f0d2c7bb31af840eb49f0f007 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 14 Mar 2008 08:58:45 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.5.4.4-551-g1658 --- config.txt | 5 +++++ git-add.html | 20 +++++++++----------- git-add.txt | 18 ++++++++---------- git-config.html | 12 +++++++++++- git-web--browse.html | 13 ++++++++++++- git-web--browse.txt | 21 +++++++++++++++++++++ 6 files changed, 66 insertions(+), 23 deletions(-) diff --git a/config.txt b/config.txt index bfad0e385..ed2cb832b 100644 --- a/config.txt +++ b/config.txt @@ -420,6 +420,11 @@ branch..rebase:: it unless you understand the implications (see linkgit:git-rebase[1] for details). +browser..cmd:: + Specify the command to invoke the specified browser. The + specified command is evaluated in shell with the URLs passed + as arguments. (See linkgit:git-web--browse[1].) + browser..path:: Override the path for the given tool that may be used to browse HTML help (see '-w' option in linkgit:git-help[1]) or a diff --git a/git-add.html b/git-add.html index 5ff570c90..355016d0a 100644 --- a/git-add.html +++ b/git-add.html @@ -535,16 +535,14 @@ patch

-
y - add the change from that hunk to index
-n - do not add the change from that hunk to index
-a - add the change from that hunk and all the rest to index
-d - do not the change from that hunk nor any of the rest to index
-j - do not decide on this hunk now, and view the next
-    undecided hunk
-J - do not decide on this hunk now, and view the next hunk
-k - do not decide on this hunk now, and view the previous
-    undecided hunk
-K - do not decide on this hunk now, and view the previous hunk
+
y - stage this hunk
+n - do not stage this hunk
+a - stage this and all the remaining hunks in the file
+d - do not stage this hunk nor any of the remaining hunks in the file
+j - leave this hunk undecided, see next undecided hunk
+J - leave this hunk undecided, see next hunk
+k - leave this hunk undecided, see previous undecided hunk
+K - leave this hunk undecided, see previous hunk
 s - split the current hunk into smaller hunks
 ? - print help
@@ -585,7 +583,7 @@ diff diff --git a/git-add.txt b/git-add.txt index 47799097c..c751a17d0 100644 --- a/git-add.txt +++ b/git-add.txt @@ -207,16 +207,14 @@ patch:: and the working tree file and asks you if you want to stage the change of each hunk. You can say: - y - add the change from that hunk to index - n - do not add the change from that hunk to index - a - add the change from that hunk and all the rest to index - d - do not the change from that hunk nor any of the rest to index - j - do not decide on this hunk now, and view the next - undecided hunk - J - do not decide on this hunk now, and view the next hunk - k - do not decide on this hunk now, and view the previous - undecided hunk - K - do not decide on this hunk now, and view the previous hunk + y - stage this hunk + n - do not stage this hunk + a - stage this and all the remaining hunks in the file + d - do not stage this hunk nor any of the remaining hunks in the file + j - leave this hunk undecided, see next undecided hunk + J - leave this hunk undecided, see next hunk + k - leave this hunk undecided, see previous undecided hunk + K - leave this hunk undecided, see previous hunk s - split the current hunk into smaller hunks ? - print help + diff --git a/git-config.html b/git-config.html index 5d9175011..4aae093fe 100644 --- a/git-config.html +++ b/git-config.html @@ -1267,6 +1267,16 @@ branch.<name>.rebase

+browser.<tool>.cmd +
+
+

+ Specify the command to invoke the specified browser. The + specified command is evaluated in shell with the URLs passed + as arguments. (See git-web--browse(1).) +

+
+
browser.<tool>.path
@@ -2373,7 +2383,7 @@ web.browser diff --git a/git-web--browse.html b/git-web--browse.html index 902d6bc42..888590942 100644 --- a/git-web--browse.html +++ b/git-web--browse.html @@ -322,6 +322,7 @@ open (this is the default under Mac OS X GUI)

+

Custom commands may also be specified.

OPTIONS

@@ -356,14 +357,24 @@ open (this is the default under Mac OS X GUI)

CONFIGURATION VARIABLES

+

CONF.VAR (from -c option) and web.browser

The web browser can be specified using a configuration variable passed with the -c (or --config) command line option, or the web.browser configuration variable if the former is not used.

+

browser.<tool>.path

You can explicitly provide a full path to your preferred 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-web--browse assumes the tool is available in PATH.

+

browser.<tool>.cmd

+

When the browser, specified by options or configuration variables, is +not among the supported ones, then the corresponding +browser.<tool>.cmd configuration variable will be looked up. If this +variable exists then "git web--browse" will treat the specified tool +as a custom command and will use a shell eval to run the command with +the URLs passed as arguments.

+

Note about git config --global

Note that these configuration variables should probably be set using the --global flag, for example like this:

@@ -389,7 +400,7 @@ git-list <git@vger.kernel.org>.

diff --git a/git-web--browse.txt b/git-web--browse.txt index df57d010e..ddbae5b19 100644 --- a/git-web--browse.txt +++ b/git-web--browse.txt @@ -27,6 +27,8 @@ The following browsers (or commands) are currently supported: * dillo * open (this is the default under Mac OS X GUI) +Custom commands may also be specified. + OPTIONS ------- -b BROWSER|--browser=BROWSER:: @@ -43,16 +45,35 @@ OPTIONS CONFIGURATION VARIABLES ----------------------- +CONF.VAR (from -c option) and web.browser +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + The web browser can be specified using a configuration variable passed with the -c (or --config) command line option, or the 'web.browser' configuration variable if the former is not used. +browser..path +~~~~~~~~~~~~~~~~~~~ + You can explicitly provide a full path to your preferred 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-web--browse' assumes the tool is available in PATH. +browser..cmd +~~~~~~~~~~~~~~~~~~ + +When the browser, specified by options or configuration variables, is +not among the supported ones, then the corresponding +'browser..cmd' configuration variable will be looked up. If this +variable exists then "git web--browse" will treat the specified tool +as a custom command and will use a shell eval to run the command with +the URLs passed as arguments. + +Note about git config --global +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + Note that these configuration variables should probably be set using the '--global' flag, for example like this: -- 2.26.2