From: Junio C Hamano Date: Sat, 17 May 2008 06:12:23 +0000 (+0000) Subject: Autogenerated HTML docs for v1.5.5.1-315-g6d2c1c X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0f7b5a99cef87c294a3c3591b4990ca4077b0d0a;p=git.git Autogenerated HTML docs for v1.5.5.1-315-g6d2c1c --- diff --git a/git-filter-branch.html b/git-filter-branch.html index 3c7d6000a..ba8127bf6 100644 --- a/git-filter-branch.html +++ b/git-filter-branch.html @@ -493,6 +493,9 @@ or copyright violation) from all commits:

git filter-branch --tree-filter 'rm filename' HEAD
+

However, if the file is absent from the tree of some commit, +a simple rm filename will fail for that tree and commit. +Thus you may instead want to use rm -f filename as the script.

A significantly faster version:

@@ -611,7 +614,7 @@ and the git list <git@vger.kernel.org>

diff --git a/git-filter-branch.txt b/git-filter-branch.txt index 8d80f0d07..506c37af7 100644 --- a/git-filter-branch.txt +++ b/git-filter-branch.txt @@ -183,6 +183,10 @@ or copyright violation) from all commits: git filter-branch --tree-filter 'rm filename' HEAD ------------------------------------------------------- +However, if the file is absent from the tree of some commit, +a simple `rm filename` will fail for that tree and commit. +Thus you may instead want to use `rm -f filename` as the script. + A significantly faster version: -------------------------------------------------------------------------- diff --git a/git-submodule.html b/git-submodule.html index 3eb916763..7cb2e3d64 100644 --- a/git-submodule.html +++ b/git-submodule.html @@ -275,7 +275,8 @@ git-submodule(1) Manual Page
git-submodule [--quiet] add [-b branch] [--] <repository> [<path>] git-submodule [--quiet] status [--cached] [--] [<path>…] -git-submodule [--quiet] [init|update] [--] [<path>…] +git-submodule [--quiet] init [--] [<path>…] +git-submodule [--quiet] update [--init] [--] [<path>…] git-submodule [--quiet] summary [--summary-limit <n>] [commit] [--] [<path>…]

COMMANDS

@@ -331,6 +332,9 @@ update checkout the commit specified in the index of the containing repository. This will make the submodules HEAD be detached.

+

If the submodule is not yet initialized, and you just want to use the +setting as stored in .gitmodules, you can automatically initialize the +submodule with the --init option.

summary @@ -415,7 +419,7 @@ for details.

diff --git a/git-submodule.txt b/git-submodule.txt index 6ffd896fb..0668f295e 100644 --- a/git-submodule.txt +++ b/git-submodule.txt @@ -11,7 +11,8 @@ SYNOPSIS [verse] 'git-submodule' [--quiet] add [-b branch] [--] [] 'git-submodule' [--quiet] status [--cached] [--] [...] -'git-submodule' [--quiet] [init|update] [--] [...] +'git-submodule' [--quiet] init [--] [...] +'git-submodule' [--quiet] update [--init] [--] [...] 'git-submodule' [--quiet] summary [--summary-limit ] [commit] [--] [...] @@ -47,6 +48,10 @@ update:: Update the registered submodules, i.e. clone missing submodules and checkout the commit specified in the index of the containing repository. This will make the submodules HEAD be detached. ++ +If the submodule is not yet initialized, and you just want to use the +setting as stored in .gitmodules, you can automatically initialize the +submodule with the --init option. summary:: Show commit summary between the given commit (defaults to HEAD) and diff --git a/git-web--browse.html b/git-web--browse.html index ebc92fb09..8ed493c43 100644 --- a/git-web--browse.html +++ b/git-web--browse.html @@ -380,7 +380,7 @@ the URLs passed as arguments.

When konqueror is specified by the a command line option or a configuration variable, we launch kfmclient to try to open the HTML man page on an already opened konqueror in a new tab if possible.

-

For consistency, we also try such a trick if brower.konqueror.path is +

For consistency, we also try such a trick if browser.konqueror.path is set to something like A_PATH_TO/konqueror. That means we will try to launch A_PATH_TO/kfmclient instead.

If you really want to use konqueror, then you can use something like @@ -419,7 +419,7 @@ git-list <git@vger.kernel.org>.

diff --git a/git-web--browse.txt b/git-web--browse.txt index 92ef57456..5ba0b9f1c 100644 --- a/git-web--browse.txt +++ b/git-web--browse.txt @@ -78,7 +78,7 @@ When 'konqueror' is specified by the a command line option or a configuration variable, we launch 'kfmclient' to try to open the HTML man page on an already opened konqueror in a new tab if possible. -For consistency, we also try such a trick if 'brower.konqueror.path' is +For consistency, we also try such a trick if 'browser.konqueror.path' is set to something like 'A_PATH_TO/konqueror'. That means we will try to launch 'A_PATH_TO/kfmclient' instead.