From a6331a8706970d61f59625118c262f0e97178d4f Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 21 Jan 2006 23:50:33 -0800 Subject: [PATCH] Autogenerated HTML docs for v1.1.4-g5b2b --- git-commit.html | 4 ++-- git-commit.txt | 2 +- git-grep.html | 30 +++++++++++++++++++++++++----- git-grep.txt | 19 +++++++++++++++---- git-ls-files.html | 11 ++++++++++- git-ls-files.txt | 4 ++++ git-reset.html | 10 +++++----- git-reset.txt | 8 ++++---- git-svnimport.html | 26 ++++++-------------------- git-svnimport.txt | 12 ++++-------- 10 files changed, 76 insertions(+), 50 deletions(-) diff --git a/git-commit.html b/git-commit.html index 01c69600..44e85edc 100644 --- a/git-commit.html +++ b/git-commit.html @@ -296,7 +296,7 @@ information.

Update all paths in the index file. This flag notices files that have been modified and deleted, but new files - you have not told about git are not affected. + you have not told git about are not affected.

@@ -399,7 +399,7 @@ Junio C Hamano <junkio@cox.net>

diff --git a/git-commit.txt b/git-commit.txt index e35984df..72f96fcf 100644 --- a/git-commit.txt +++ b/git-commit.txt @@ -27,7 +27,7 @@ OPTIONS -a|--all:: Update all paths in the index file. This flag notices files that have been modified and deleted, but new files - you have not told about git are not affected. + you have not told git about are not affected. -c or -C :: Take existing commit object, and reuse the log message diff --git a/git-grep.html b/git-grep.html index fcf21277..4fb85d56 100644 --- a/git-grep.html +++ b/git-grep.html @@ -272,7 +272,7 @@ git-grep(1) Manual Page

SYNOPSIS

-

git-grep [<option>…] <pattern> [<path>…]

+

git-grep [<option>…] [-e] <pattern> [--] [<path>…]

DESCRIPTION

@@ -283,21 +283,41 @@ containing a match to the given pattern.

+-- +
+
+

+ Signals the end of options; the rest of the parameters + are <path> limiters. +

+
+
<option>…

Either an option to pass to grep or git-ls-files. - Some grep options, such as -C and -m, that take - parameters are known to git-grep.

+
+
+
The following are the specific `git-ls-files` options
+that may be given: `-o`, `--cached`, `--deleted`, `--others`,
+`--killed`, `--ignored`, `--modified`, `--exclude=*`,
+`--exclude-from=*`, and `--exclude-per-directory=*`.
+
+
+
+
All other options will be passed to `grep`.
+
<pattern>

- The pattern to look for. + The pattern to look for. The first non option is taken + as the pattern; if your pattern begins with a dash, use + -e <pattern>.

@@ -325,7 +345,7 @@ containing a match to the given pattern.

diff --git a/git-grep.txt b/git-grep.txt index 2bfd8edb..bf4b592f 100644 --- a/git-grep.txt +++ b/git-grep.txt @@ -8,7 +8,7 @@ git-grep - print lines matching a pattern SYNOPSIS -------- -'git-grep' [
+--directory +
+
+

+ If a whole directory is classified as "other", show just its + name (with a trailing slash) and not its whole contents. +

+
+
-u|--unmerged
@@ -624,7 +633,7 @@ otherwise, it is a shell glob pattern, suitable for diff --git a/git-ls-files.txt b/git-ls-files.txt index e42af5eb..e433407a 100644 --- a/git-ls-files.txt +++ b/git-ls-files.txt @@ -46,6 +46,10 @@ OPTIONS -s|--stage:: Show stage files in the output +--directory:: + If a whole directory is classified as "other", show just its + name (with a trailing slash) and not its whole contents. + -u|--unmerged:: Show unmerged files in the output (forces --stage) diff --git a/git-reset.html b/git-reset.html index 83ee3679..915201d1 100644 --- a/git-reset.html +++ b/git-reset.html @@ -448,8 +448,8 @@ and resets the tip of the branch to that commit. Interrupted workflow
-

You can get interrupted by an ungent fix request while you are -still in the middle of a large change. The files in your +

Suppose you are interrupted by an urgent fix request while you +are in the middle of a large change. The files in your working tree are not in any shape to be committed yet, but you need to get to the other branch for a quick bugfix.

@@ -465,8 +465,8 @@ $ git reset --soft HEAD^ ;# go back to WIP state (2) $ git reset (3) (1) This commit will get blown away so a throw-away log message is OK. -(2) This removes the 'WIP' commit from the commit history, and makes - your working tree in the state just before you made that snapshot. +(2) This removes the 'WIP' commit from the commit history, and sets + your working tree to the state just before you made that snapshot. (3) After (2), the index file still has all the WIP changes you committed in (1). This sets it to the last commit you were basing the WIP changes on. @@ -488,7 +488,7 @@ $ git reset (3)
diff --git a/git-reset.txt b/git-reset.txt index 315683a6..b4e737e6 100644 --- a/git-reset.txt +++ b/git-reset.txt @@ -147,8 +147,8 @@ and resets the tip of the branch to that commit. Interrupted workflow:: + -You can get interrupted by an ungent fix request while you are -still in the middle of a large change. The files in your +Suppose you are interrupted by an urgent fix request while you +are in the middle of a large change. The files in your working tree are not in any shape to be committed yet, but you need to get to the other branch for a quick bugfix. + @@ -164,8 +164,8 @@ $ git reset --soft HEAD^ ;# go back to WIP state <2> $ git reset <3> <1> This commit will get blown away so a throw-away log message is OK. -<2> This removes the 'WIP' commit from the commit history, and makes - your working tree in the state just before you made that snapshot. +<2> This removes the 'WIP' commit from the commit history, and sets + your working tree to the state just before you made that snapshot. <3> After <2>, the index file still has all the WIP changes you committed in <1>. This sets it to the last commit you were basing the WIP changes on. diff --git a/git-svnimport.html b/git-svnimport.html index c8ab35c7..38f38b82 100644 --- a/git-svnimport.html +++ b/git-svnimport.html @@ -282,16 +282,7 @@ git-svnimport(1) Manual Page

Imports a SVN repository into git. It will either create a new repository, or incrementally import into an existing one.

-
- - - - -
-SVN access is done by the SVN - -Perl module. -
+

SVN access is done by the SVN::Perl module.

git-svnimport assumes that SVN repositories are organized into one "trunk" directory where the main development happens, "branch/FOO" directories for branches, and "/tags/FOO" directories for tags. @@ -393,8 +384,8 @@ incremental SVN imports.

-
Formerly, this option controlled how many revisions to pull, due to
-SVN memory leaks. (These have been worked around.)
+
Formerly, this option controlled how many revisions to pull,
+due to SVN memory leaks. (These have been worked around.)
@@ -439,18 +430,13 @@ with a 40x error pretty quickly.

repository itself; it usually ends in "/svn".

-<SVN_repository_URL> +<path>

- The URL of the SVN module you want to import. For local - repositories, use "file:///absolute/path". + The path to the module you want to check out.

- -

<path> - The path to the module you want to check out.

-
-h
@@ -483,7 +469,7 @@ various participants of the git-list <git@vger.kernel.org>.

diff --git a/git-svnimport.txt b/git-svnimport.txt index db1ce38d..63e28b89 100644 --- a/git-svnimport.txt +++ b/git-svnimport.txt @@ -21,7 +21,7 @@ DESCRIPTION Imports a SVN repository into git. It will either create a new repository, or incrementally import into an existing one. -SVN access is done by the SVN:: Perl module. +SVN access is done by the SVN::Perl module. git-svnimport assumes that SVN repositories are organized into one "trunk" directory where the main development happens, "branch/FOO" @@ -74,8 +74,8 @@ When importing incrementally, you might need to edit the .git/svn2git file. -l :: Specify a maximum revision number to pull. - Formerly, this option controlled how many revisions to pull, due to - SVN memory leaks. (These have been worked around.) + Formerly, this option controlled how many revisions to pull, + due to SVN memory leaks. (These have been worked around.) -v:: Verbosity: let 'svnimport' report what it is doing. @@ -100,11 +100,7 @@ with a 40x error pretty quickly. If you're using the "-d" or "-D" option, this is the URL of the SVN repository itself; it usually ends in "/svn". -:: - The URL of the SVN module you want to import. For local - repositories, use "file:///absolute/path". - - +:: The path to the module you want to check out. -h:: -- 2.11.0