From: Junio C Hamano Date: Fri, 27 Apr 2007 08:22:22 +0000 (+0000) Subject: Autogenerated HTML docs for v1.5.2-rc0-71-g4342 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9882a5200fb6c505c213d9fd3d9d664e2b14f983;p=git.git Autogenerated HTML docs for v1.5.2-rc0-71-g4342 --- diff --git a/blame-options.txt b/blame-options.txt index 331f161c7..a46bf6ce7 100644 --- a/blame-options.txt +++ b/blame-options.txt @@ -9,8 +9,28 @@ --show-stats:: Include additional statistics at the end of blame output. --L n,m:: - Annotate only the specified line range (lines count from 1). +-L ,:: + Annotate only the given line range. and can take + one of these forms: + + - number ++ +If or is a number, it specifies an +absolute line number (lines count from 1). ++ + +- /regex/ ++ +This form will use the first line matching the given +POSIX regex. If is a regex, it will search +starting at the line given by . ++ + +- +offset or -offset ++ +This is only valid for and will specify a number +of lines before or after the line given by . ++ -l:: Show long rev (Default: off). diff --git a/fetch-options.txt b/fetch-options.txt index 5b4d184a7..bdc7332c7 100644 --- a/fetch-options.txt +++ b/fetch-options.txt @@ -1,13 +1,20 @@ +-q, \--quiet:: + Pass --quiet to git-fetch-pack and silence any other internally + used programs. + +-v, \--verbose:: + Be verbose. + -a, \--append:: Append ref names and object names of fetched refs to the existing contents of `.git/FETCH_HEAD`. Without this option old data in `.git/FETCH_HEAD` will be overwritten. \--upload-pack :: - When given, and the repository to fetch from is handled - by 'git-fetch-pack', '--exec=' is passed to - the command to specify non-default path for the command - run on the other end. + When given, and the repository to fetch from is handled + by 'git-fetch-pack', '--exec=' is passed to + the command to specify non-default path for the command + run on the other end. -f, \--force:: When `git-fetch` is used with `:` @@ -16,7 +23,7 @@ fetches is a descendant of ``. This option overrides that check. -\--no-tags:: +-n, \--no-tags:: By default, `git-fetch` fetches tags that point at objects that are downloaded from the remote repository and stores them locally. This option disables this diff --git a/git-annotate.html b/git-annotate.html index a8a6215b3..3043a7474 100644 --- a/git-annotate.html +++ b/git-annotate.html @@ -309,12 +309,37 @@ which introduced the line. Optionally annotate from a given revision.

--L n,m +-L <start>,<end>

- Annotate only the specified line range (lines count from 1). + Annotate only the given line range. <start> and <end> can take + one of these forms:

+
    +
  • +

    +number +

    +

    If <start> or <end> is a number, it specifies an +absolute line number (lines count from 1).

    +
    • +
  • +

    +/regex/ +

    +

    This form will use the first line matching the given +POSIX regex. If <end> is a regex, it will search +starting at the line given by <start>.

    +
    • +
  • +

    ++offset or -offset +

    +

    This is only valid for <end> and will specify a number +of lines before or after the line given by <start>.

    +
    • +
-l @@ -435,7 +460,7 @@ commit. diff --git a/git-blame.html b/git-blame.html index c76fe7618..03111d160 100644 --- a/git-blame.html +++ b/git-blame.html @@ -327,12 +327,37 @@ ea4c7f9bf69e781dd0cd88d2bccb2bf5cc15c9a7 git-blame: Make the output

--L n,m +-L <start>,<end>

- Annotate only the specified line range (lines count from 1). + Annotate only the given line range. <start> and <end> can take + one of these forms:

+
    +
  • +

    +number +

    +

    If <start> or <end> is a number, it specifies an +absolute line number (lines count from 1).

    +
    • +
  • +

    +/regex/ +

    +

    This form will use the first line matching the given +POSIX regex. If <end> is a regex, it will search +starting at the line given by <start>.

    +
    • +
  • +

    ++offset or -offset +

    +

    This is only valid for <end> and will specify a number +of lines before or after the line given by <start>.

    +
    • +
-l @@ -650,7 +675,7 @@ commit commentary), a blame viewer won't ever care. diff --git a/git-diff-files.html b/git-diff-files.html index 4de4601e2..716c9985e 100644 --- a/git-diff-files.html +++ b/git-diff-files.html @@ -272,7 +272,7 @@ git-diff-files(1) Manual Page

SYNOPSIS

-

git-diff-files [-q] [-0|-1|-2|-3|-c|--cc|-n|--no-index] [<common diff options>] [<path>…]

+

git-diff-files [-q] [-0|-1|-2|-3|-c|--cc|--no-index] [<common diff options>] [<path>…]

DESCRIPTION

@@ -682,7 +682,7 @@ omit diff output for unmerged entries and just show "Unmerged".

-\-n,--no-index +--no-index

@@ -1029,7 +1029,7 @@ two unresolved merge parents with the working tree file

diff --git a/git-diff-files.txt b/git-diff-files.txt index b78c4c64f..2e1e29ef5 100644 --- a/git-diff-files.txt +++ b/git-diff-files.txt @@ -8,7 +8,7 @@ git-diff-files - Compares files in the working tree and the index SYNOPSIS -------- -'git-diff-files' [-q] [-0|-1|-2|-3|-c|--cc|-n|--no-index] [] [...] +'git-diff-files' [-q] [-0|-1|-2|-3|-c|--cc|--no-index] [] [...] DESCRIPTION ----------- @@ -36,7 +36,7 @@ omit diff output for unmerged entries and just show "Unmerged". diff, similar to the way 'diff-tree' shows a merge commit with these flags. -\-n,\--no-index:: +--no-index:: Compare the two given files / directories. -q:: diff --git a/git-fetch.html b/git-fetch.html index 547cb1c6e..ccb343fa8 100644 --- a/git-fetch.html +++ b/git-fetch.html @@ -293,6 +293,23 @@ branches you are not interested in, you will not get them.

+-q, --quiet +
+
+

+ Pass --quiet to git-fetch-pack and silence any other internally + used programs. +

+
+
+-v, --verbose +
+
+

+ Be verbose. +

+
+
-a, --append
@@ -326,7 +343,7 @@ branches you are not interested in, you will not get them.

---no-tags +-n, --no-tags

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

diff --git a/git-fmt-merge-msg.html b/git-fmt-merge-msg.html index 8f300e730..2c143061a 100644 --- a/git-fmt-merge-msg.html +++ b/git-fmt-merge-msg.html @@ -272,7 +272,8 @@ git-fmt-merge-msg(1) Manual Page

SYNOPSIS

-

git-fmt-merge-msg <$GIT_DIR/FETCH_HEAD

+

git-fmt-merge-msg [--summary | --no-summary] <$GIT_DIR/FETCH_HEAD +git-fmt-merge-msg [--summary | --no-summray] -F <file>

DESCRIPTION

@@ -282,6 +283,53 @@ passed as the <merge-message> argument of git-merge.

This script is intended mostly for internal use by scripts automatically invoking git-merge.

+

OPTIONS

+
+
+
+--summary +
+
+

+ In addition to branch names, populate the log message with + one-line descriptions from the actual commits that are being + merged. +

+
+
+--no-summary +
+
+

+ Do not list one-line descriptions from the actual commits being + merged. +

+
+
+--file <file>, -F <file> +
+
+

+ Take the list of merged objects from <file> instead of + stdin. +

+
+
+
+

CONFIGURATION

+
+
+
+merge.summary +
+
+

+ Whether to include summaries of merged commits in newly + merge commit messages. False by default. +

+
+
+

SEE ALSO

git-merge(1)

@@ -300,7 +348,7 @@ automatically invoking git-merge.

diff --git a/git-fmt-merge-msg.txt b/git-fmt-merge-msg.txt index a70eb3994..e560b30c5 100644 --- a/git-fmt-merge-msg.txt +++ b/git-fmt-merge-msg.txt @@ -8,7 +8,8 @@ git-fmt-merge-msg - Produce a merge commit message SYNOPSIS -------- -'git-fmt-merge-msg' <$GIT_DIR/FETCH_HEAD +git-fmt-merge-msg [--summary | --no-summary] <$GIT_DIR/FETCH_HEAD +git-fmt-merge-msg [--summary | --no-summray] -F DESCRIPTION ----------- @@ -19,6 +20,28 @@ passed as the '' argument of `git-merge`. This script is intended mostly for internal use by scripts automatically invoking `git-merge`. +OPTIONS +------- + +--summary:: + In addition to branch names, populate the log message with + one-line descriptions from the actual commits that are being + merged. + +--no-summary:: + Do not list one-line descriptions from the actual commits being + merged. + +--file , -F :: + Take the list of merged objects from instead of + stdin. + +CONFIGURATION +------------- + +merge.summary:: + Whether to include summaries of merged commits in newly + merge commit messages. False by default. SEE ALSO -------- diff --git a/git-grep.html b/git-grep.html index 2fe9160ca..0c07ee6ee 100644 --- a/git-grep.html +++ b/git-grep.html @@ -276,12 +276,13 @@ git-grep(1) Manual Page
git-grep [--cached] [-a | --text] [-I] [-i | --ignore-case] [-w | --word-regexp] [-v | --invert-match] [-h|-H] [--full-name] - [-E | --extended-regexp] [-G | --basic-regexp] [-F | --fixed-strings] - [-n] [-l | --files-with-matches] [-L | --files-without-match] + [-E | --extended-regexp] [-G | --basic-regexp] + [-F | --fixed-strings] [-n] + [-l | --files-with-matches] [-L | --files-without-match] [-c | --count] [--all-match] [-A <post-context>] [-B <pre-context>] [-C <context>] - [-f <file>] [-e] <pattern> [--and|--or|--not|(|)|-e <pattern>…] - [<tree>…] + [-f <file>] [-e] <pattern> + [--and|--or|--not|(|)|-e <pattern>…] [<tree>…] [--] [<path>…]

DESCRIPTION

@@ -319,6 +320,14 @@ registered in the index file, or given tree objects.

+-I +
+
+

+ Don't match the pattern in binary files. +

+
+
-w | --word-regexp
@@ -369,6 +378,15 @@ registered in the index file, or given tree objects.

+-F | --fixed-strings +
+
+

+ Use fixed strings for patterns (don't interpret pattern + as a regex). +

+
+
-n
@@ -406,6 +424,14 @@ registered in the index file, or given tree objects.

+-<num> +
+
+

+ A shortcut for specifying -C<num>. +

+
+
-f <file>
@@ -502,7 +528,7 @@ revamped by Junio C Hamano.

diff --git a/git-grep.txt b/git-grep.txt index 0140c8e35..c5a5dad1c 100644 --- a/git-grep.txt +++ b/git-grep.txt @@ -12,12 +12,13 @@ SYNOPSIS 'git-grep' [--cached] [-a | --text] [-I] [-i | --ignore-case] [-w | --word-regexp] [-v | --invert-match] [-h|-H] [--full-name] - [-E | --extended-regexp] [-G | --basic-regexp] [-F | --fixed-strings] - [-n] [-l | --files-with-matches] [-L | --files-without-match] + [-E | --extended-regexp] [-G | --basic-regexp] + [-F | --fixed-strings] [-n] + [-l | --files-with-matches] [-L | --files-without-match] [-c | --count] [--all-match] [-A ] [-B ] [-C ] - [-f ] [-e] [--and|--or|--not|(|)|-e ...] - [...] + [-f ] [-e] + [--and|--or|--not|(|)|-e ...] [...] [--] [...] DESCRIPTION @@ -39,6 +40,9 @@ OPTIONS Ignore case differences between the patterns and the files. +-I:: + Don't match the pattern in binary files. + -w | --word-regexp:: Match the pattern only at word boundary (either begin at the beginning of a line, or preceded by a non-word character; end at @@ -64,6 +68,10 @@ OPTIONS Use POSIX extended/basic regexp for patterns. Default is to use basic regexp. +-F | --fixed-strings:: + Use fixed strings for patterns (don't interpret pattern + as a regex). + -n:: Prefix the line number to matching lines. @@ -81,6 +89,9 @@ OPTIONS line containing `--` between contiguous groups of matches. +-:: + A shortcut for specifying -C. + -f :: Read patterns from , one per line. diff --git a/git-http-fetch.html b/git-http-fetch.html index 4a9c3a6b1..3abae8377 100644 --- a/git-http-fetch.html +++ b/git-http-fetch.html @@ -344,6 +344,15 @@ commit-id 
<commit-id>['\t'<filename-as-in--w>]
+
+--recover +
+
+

+ Verify that everything reachable from target is fetched. Used after + an earlier fetch is interrupted. +

+

Author

@@ -360,7 +369,7 @@ commit-id diff --git a/git-http-fetch.txt b/git-http-fetch.txt index 7dc2df304..4deabc376 100644 --- a/git-http-fetch.txt +++ b/git-http-fetch.txt @@ -39,6 +39,10 @@ commit-id:: ['\t'] +--recover:: + Verify that everything reachable from target is fetched. Used after + an earlier fetch is interrupted. + Author ------ Written by Linus Torvalds diff --git a/git-http-push.html b/git-http-push.html index 9b8acca5f..3fd7de527 100644 --- a/git-http-push.html +++ b/git-http-push.html @@ -272,7 +272,7 @@ git-http-push(1) Manual Page

SYNOPSIS

-

git-http-push [--complete] [--force] [--verbose] <url> <ref> [<ref>…]

+

git-http-push [--all] [--force] [--verbose] <url> <ref> [<ref>…]

DESCRIPTION

@@ -283,7 +283,7 @@ remote branch.

---complete +--all

@@ -314,6 +314,33 @@ remote branch.

+-d, -D +
+
+

+ Remove <ref> from remote repository. The specified branch + cannot be the remote HEAD. If -d is specified the following + other conditions must also be met: +

+
    +
  • +

    +Remote HEAD must resolve to an object that exists locally +

    +
    • +
  • +

    +Specified branch resolves to an object that exists locally +

    +
    • +
  • +

    +Specified branch is an ancestor of the remote HEAD +

    +
    • +
+
+
<ref>…
@@ -385,7 +412,7 @@ to disable the fast-forward check only on that ref.

diff --git a/git-http-push.txt b/git-http-push.txt index 4b4a46169..a15cf5b2a 100644 --- a/git-http-push.txt +++ b/git-http-push.txt @@ -8,7 +8,7 @@ git-http-push - Push objects over HTTP/DAV to another repository SYNOPSIS -------- -'git-http-push' [--complete] [--force] [--verbose] [...] +'git-http-push' [--all] [--force] [--verbose] [...] DESCRIPTION ----------- @@ -18,7 +18,7 @@ remote branch. OPTIONS ------- ---complete:: +--all:: Do not assume that the remote repository is complete in its current state, and verify all objects in the entire local ref's history exist in the remote repository. @@ -34,6 +34,15 @@ OPTIONS Report the list of objects being walked locally and the list of objects successfully sent to the remote repository. +-d, -D:: + Remove from remote repository. The specified branch + cannot be the remote HEAD. If -d is specified the following + other conditions must also be met: + + - Remote HEAD must resolve to an object that exists locally + - Specified branch resolves to an object that exists locally + - Specified branch is an ancestor of the remote HEAD + ...:: The remote refs to update. diff --git a/git-local-fetch.html b/git-local-fetch.html index b77a46ddd..5fb0d35e7 100644 --- a/git-local-fetch.html +++ b/git-local-fetch.html @@ -314,6 +314,34 @@ git-local-fetch(1) Manual Page

+-s +
+
+

+ Instead of regular file-to-file copying use symbolic links to the objects + in the remote repository. +

+
+
+-l +
+
+

+ Before attempting symlinks (if -s is specified) or file-to-file copying the + remote objects, try to hardlink the remote objects into the local + repository. +

+
+
+-n +
+
+

+ Never attempt to file-to-file copy remote objects. Only useful with + -s or -l command-line options. +

+
+
-w <filename>
@@ -335,6 +363,15 @@ git-local-fetch(1) Manual Page 
<commit-id>['\t'<filename-as-in--w>]
+
+--recover +
+
+

+ Verify that everything reachable from target is fetched. Used after + an earlier fetch is interrupted. +

+

Author

@@ -351,7 +388,7 @@ git-local-fetch(1) Manual Page diff --git a/git-local-fetch.txt b/git-local-fetch.txt index 22048d82b..dd9e2387f 100644 --- a/git-local-fetch.txt +++ b/git-local-fetch.txt @@ -24,6 +24,16 @@ OPTIONS Get all the objects. -v:: Report what is downloaded. +-s:: + Instead of regular file-to-file copying use symbolic links to the objects + in the remote repository. +-l:: + Before attempting symlinks (if -s is specified) or file-to-file copying the + remote objects, try to hardlink the remote objects into the local + repository. +-n:: + Never attempt to file-to-file copy remote objects. Only useful with + -s or -l command-line options. -w :: Writes the commit-id into the filename under $GIT_DIR/refs/ on @@ -35,6 +45,10 @@ OPTIONS ['\t'] +--recover:: + Verify that everything reachable from target is fetched. Used after + an earlier fetch is interrupted. + Author ------ Written by Junio C Hamano diff --git a/git-pull.html b/git-pull.html index 31eaf60b0..50e706606 100644 --- a/git-pull.html +++ b/git-pull.html @@ -330,6 +330,23 @@ when merging local branches into the current branch.

+-q, --quiet +
+
+

+ Pass --quiet to git-fetch-pack and silence any other internally + used programs. +

+
+
+-v, --verbose +
+
+

+ Be verbose. +

+
+
-a, --append
@@ -363,7 +380,7 @@ when merging local branches into the current branch.

---no-tags +-n, --no-tags

@@ -870,7 +887,7 @@ Junio C Hamano and the git-list <git@vger.kernel.org>.