From 54559c8b9d844fcbb8510673984390f766841b72 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 13 Apr 2006 07:45:12 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.3.0-rc3-gd53352 --- diff-options.txt | 3 + git-apply.html | 15 ++- git-apply.txt | 8 +- git-diff-files.html | 10 +- git-diff-index.html | 10 +- git-diff-stages.html | 10 +- git-diff-tree.html | 10 +- git-merge-tree.html | 307 +++++++++++++++++++++++++++++++++++++++++++++++++ git-merge-tree.txt | 37 ++++++ git-mktree.html | 314 +++++++++++++++++++++++++++++++++++++++++++++++++++ git-mktree.txt | 35 ++++++ git.html | 58 +++++++++- git.txt | 21 ++++ 13 files changed, 830 insertions(+), 8 deletions(-) create mode 100644 git-merge-tree.html create mode 100644 git-merge-tree.txt create mode 100644 git-mktree.html create mode 100644 git-mktree.txt diff --git a/diff-options.txt b/diff-options.txt index ec6811c7..338014c8 100644 --- a/diff-options.txt +++ b/diff-options.txt @@ -4,6 +4,9 @@ -u:: Synonym for "-p". +--patch-with-raw:: + Generate patch but keep also the default raw diff output. + -z:: \0 line termination on output diff --git a/git-apply.html b/git-apply.html index e809b6e1..497d5636 100644 --- a/git-apply.html +++ b/git-apply.html @@ -275,7 +275,7 @@ git-apply(1) Manual Page
git-apply [--stat] [--numstat] [--summary] [--check] [--index] [--apply] [--no-add] [--index-info] [--allow-binary-replacement] [-z] [-pNUM] - [--whitespace=<nowarn|warn|error|error-all|strip>] + [-CNUM] [--whitespace=<nowarn|warn|error|error-all|strip>] [<patch>…]

DESCRIPTION

@@ -384,6 +384,17 @@ and a work tree.

+-C<n> +
+
+

+ Ensure at least <n> lines of surrounding context match before + and after each change. When fewer lines of surrounding + context exist they all most match. By default no context is + ever ignored. +

+
+
--apply
@@ -499,7 +510,7 @@ apply.whitespace diff --git a/git-apply.txt b/git-apply.txt index 1c64a1aa..e93ea1f2 100644 --- a/git-apply.txt +++ b/git-apply.txt @@ -11,7 +11,7 @@ SYNOPSIS [verse] 'git-apply' [--stat] [--numstat] [--summary] [--check] [--index] [--apply] [--no-add] [--index-info] [--allow-binary-replacement] [-z] [-pNUM] - [--whitespace=] + [-CNUM] [--whitespace=] [...] DESCRIPTION @@ -73,6 +73,12 @@ OPTIONS Remove leading slashes from traditional diff paths. The default is 1. +-C:: + Ensure at least lines of surrounding context match before + and after each change. When fewer lines of surrounding + context exist they all most match. By default no context is + ever ignored. + --apply:: If you use any of the options marked ``Turns off "apply"'' above, git-apply reads and outputs the diff --git a/git-diff-files.html b/git-diff-files.html index 6af9abeb..43afec50 100644 --- a/git-diff-files.html +++ b/git-diff-files.html @@ -301,6 +301,14 @@ same as "git-diff-index" and "git-diff-tree".

+--patch-with-raw +
+
+

+ Generate patch but keep also the default raw diff output. +

+
+
-z
@@ -814,7 +822,7 @@ two unresolved merge parents with the working tree file diff --git a/git-diff-index.html b/git-diff-index.html index 8e075879..30c3638b 100644 --- a/git-diff-index.html +++ b/git-diff-index.html @@ -302,6 +302,14 @@ entries in the index are compared.

+--patch-with-raw +
+
+

+ Generate patch but keep also the default raw diff output. +

+
+
-z
@@ -904,7 +912,7 @@ always have the special all-zero sha1. diff --git a/git-diff-stages.html b/git-diff-stages.html index 1fd8955c..7dc28f92 100644 --- a/git-diff-stages.html +++ b/git-diff-stages.html @@ -299,6 +299,14 @@ unmerged index file.

+--patch-with-raw +
+
+

+ Generate patch but keep also the default raw diff output. +

+
+
-z
@@ -788,7 +796,7 @@ two unresolved merge parents with the working tree file diff --git a/git-diff-tree.html b/git-diff-tree.html index f616fd6e..0c6660b9 100644 --- a/git-diff-tree.html +++ b/git-diff-tree.html @@ -304,6 +304,14 @@ git-diff-tree(1) Manual Page

+--patch-with-raw +
+
+

+ Generate patch but keep also the default raw diff output. +

+
+
-z
@@ -976,7 +984,7 @@ two unresolved merge parents with the working tree file diff --git a/git-merge-tree.html b/git-merge-tree.html new file mode 100644 index 00000000..2ea075a7 --- /dev/null +++ b/git-merge-tree.html @@ -0,0 +1,307 @@ + + + + + + +git-merge-tree(1) + + + +

SYNOPSIS

+
+

git-merge-tree <base-tree> <branch1> <branch2>

+
+

DESCRIPTION

+
+

Reads three treeish, and output trivial merge results and +conflicting stages to the standard output. This is similar to +what three-way read-tree -m does, but instead of storing the +results in the index, the command outputs the entries to the +standard output.

+

This is meant to be used by higher level scripts to compute +merge results outside index, and stuff the results back into the +index. For this reason, the output from the command omits +entries that match <branch1> tree.

+
+

Author

+
+

Written by Linus Torvalds <torvalds@osdl.org>

+
+

Documentation

+
+

Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.

+
+

GIT

+
+

Part of the git(7) suite

+
+ + + diff --git a/git-merge-tree.txt b/git-merge-tree.txt new file mode 100644 index 00000000..35fb4fb7 --- /dev/null +++ b/git-merge-tree.txt @@ -0,0 +1,37 @@ +git-merge-tree(1) +================= + +NAME +---- +git-merge-tree - Show three-way merge without touching index + + +SYNOPSIS +-------- +'git-merge-tree' + +DESCRIPTION +----------- +Reads three treeish, and output trivial merge results and +conflicting stages to the standard output. This is similar to +what three-way read-tree -m does, but instead of storing the +results in the index, the command outputs the entries to the +standard output. + +This is meant to be used by higher level scripts to compute +merge results outside index, and stuff the results back into the +index. For this reason, the output from the command omits +entries that match tree. + +Author +------ +Written by Linus Torvalds + +Documentation +-------------- +Documentation by Junio C Hamano and the git-list . + +GIT +--- +Part of the gitlink:git[7] suite + diff --git a/git-mktree.html b/git-mktree.html new file mode 100644 index 00000000..1123f7e0 --- /dev/null +++ b/git-mktree.html @@ -0,0 +1,314 @@ + + + + + + +git-mktree(1) + + + +

SYNOPSIS

+
+

git-mktree [-z]

+
+

DESCRIPTION

+
+

Reads standard input in non-recursive ls-tree output format, +and creates a tree object. The object name of the tree object +built is written to the standard output.

+
+

OPTIONS

+
+
+
+-z +
+
+

+ Read the NUL-terminated ls-tree -z output instead. +

+
+
+
+

Author

+
+

Written by Junio C Hamano <junkio@cox.net>

+
+

Documentation

+
+

Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.

+
+

GIT

+
+

Part of the git(7) suite

+
+ + + diff --git a/git-mktree.txt b/git-mktree.txt new file mode 100644 index 00000000..5f9ee603 --- /dev/null +++ b/git-mktree.txt @@ -0,0 +1,35 @@ +git-mktree(1) +============= + +NAME +---- +git-mktree - Build a tree-object from ls-tree formatted text + + +SYNOPSIS +-------- +'git-mktree' [-z] + +DESCRIPTION +----------- +Reads standard input in non-recursive `ls-tree` output format, +and creates a tree object. The object name of the tree object +built is written to the standard output. + +OPTIONS +------- +-z:: + Read the NUL-terminated `ls-tree -z` output instead. + +Author +------ +Written by Junio C Hamano + +Documentation +-------------- +Documentation by Junio C Hamano and the git-list . + +GIT +--- +Part of the gitlink:git[7] suite + diff --git a/git.html b/git.html index b85f51a0..9847fdcb 100644 --- a/git.html +++ b/git.html @@ -414,6 +414,14 @@ repositories.

+git-mktree(1) +
+
+

+ Build a tree-object from ls-tree formatted text. +

+
+
git-pack-objects(1)
@@ -799,6 +807,14 @@ ancillary user utilities.

+git-clean(1) +
+
+

+ Remove untracked files from the working tree. +

+
+
git-clone(1)
@@ -943,6 +959,14 @@ ancillary user utilities.

+git-rm(1) +
+
+

+ Remove files from the working tree and from the index. +

+
+
git-shortlog(1)
@@ -1035,6 +1059,14 @@ ancillary user utilities.

+git-cvsserver(1) +
+
+

+ A CVS server emulator for git. +

+
+
git-lost-found(1)
@@ -1142,6 +1174,14 @@ ancillary user utilities.

+git-fmt-merge-msg(1) +
+
+

+ Produce a merge commit message. +

+
+
git-get-tar-commit-id(1)
@@ -1150,6 +1190,14 @@ ancillary user utilities.

+git-imap-send(1) +
+
+

+ Dump a mailbox from stdin into an imap folder. +

+
+
git-mailinfo(1)
@@ -1169,6 +1217,14 @@ ancillary user utilities.

+git-merge-tree(1) +
+
+

+ Show three-way merge without touching index. +

+
+
git-patch-id(1)
@@ -2023,7 +2079,7 @@ contributors on the git-list <git@vger.kernel.org>.

diff --git a/git.txt b/git.txt index 06b2e530..03d860b1 100644 --- a/git.txt +++ b/git.txt @@ -100,6 +100,9 @@ gitlink:git-merge-index[1]:: gitlink:git-mktag[1]:: Creates a tag object. +gitlink:git-mktree[1]:: + Build a tree-object from ls-tree formatted text. + gitlink:git-pack-objects[1]:: Creates a packed archive of objects. @@ -265,6 +268,9 @@ gitlink:git-checkout[1]:: gitlink:git-cherry-pick[1]:: Cherry-pick the effect of an existing commit. +gitlink:git-clean[1]:: + Remove untracked files from the working tree. + gitlink:git-clone[1]:: Clones a repository into a new directory. @@ -319,6 +325,9 @@ gitlink:git-resolve[1]:: gitlink:git-revert[1]:: Revert an existing commit. +gitlink:git-rm[1]:: + Remove files from the working tree and from the index. + gitlink:git-shortlog[1]:: Summarizes 'git log' output. @@ -357,6 +366,9 @@ gitlink:git-cvsimport[1]:: gitlink:git-cvsexportcommit[1]:: Export a single commit to a CVS checkout. +gitlink:git-cvsserver[1]:: + A CVS server emulator for git. + gitlink:git-lost-found[1]:: Recover lost refs that luckily have not yet been pruned. @@ -399,9 +411,15 @@ gitlink:git-count-objects[1]:: gitlink:git-daemon[1]:: A really simple server for git repositories. +gitlink:git-fmt-merge-msg[1]:: + Produce a merge commit message. + gitlink:git-get-tar-commit-id[1]:: Extract commit ID from an archive created using git-tar-tree. +gitlink:git-imap-send[1]:: + Dump a mailbox from stdin into an imap folder. + gitlink:git-mailinfo[1]:: Extracts patch and authorship information from a single e-mail message, optionally transliterating the commit @@ -411,6 +429,9 @@ gitlink:git-mailsplit[1]:: A stupid program to split UNIX mbox format mailbox into individual pieces of e-mail. +gitlink:git-merge-tree[1]:: + Show three-way merge without touching index. + gitlink:git-patch-id[1]:: Compute unique ID for a patch. -- 2.11.0