From 261c99dd7a4e8ce749bb233403d6acf9f2c1243a Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 13 Apr 2006 07:45:28 +0000 Subject: [PATCH] Autogenerated man pages for v1.3.0-rc3-gd53352 --- man1/git-apply.1 | 6 ++++- man1/git-diff-files.1 | 4 ++++ man1/git-diff-index.1 | 4 ++++ man1/git-diff-stages.1 | 4 ++++ man1/git-diff-tree.1 | 4 ++++ man1/git-merge-tree.1 | 50 +++++++++++++++++++++++++++++++++++++++ man1/git-mktree.1 | 53 ++++++++++++++++++++++++++++++++++++++++++ man7/git.7 | 28 ++++++++++++++++++++++ 8 files changed, 152 insertions(+), 1 deletion(-) create mode 100755 man1/git-merge-tree.1 create mode 100755 man1/git-mktree.1 diff --git a/man1/git-apply.1 b/man1/git-apply.1 index b5c91f10b..e447ce59d 100755 --- a/man1/git-apply.1 +++ b/man1/git-apply.1 @@ -25,7 +25,7 @@ git-apply \- Apply patch on a git index file and a work tree .nf \fIgit\-apply\fR [\-\-stat] [\-\-numstat] [\-\-summary] [\-\-check] [\-\-index] [\-\-apply] [\-\-no\-add] [\-\-index\-info] [\-\-allow\-binary\-replacement] [\-z] [\-pNUM] - [\-\-whitespace=] + [\-CNUM] [\-\-whitespace=] [...] .fi @@ -72,6 +72,10 @@ When showing the index information, do not munge paths, but use NUL terminated m \-p Remove leading slashes from traditional diff paths\&. The default is 1\&. +.TP +\-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\&. + .TP \-\-apply If you use any of the options marked “Turns off "apply"” above, git\-apply reads and outputs the information you asked without actually applying the patch\&. Give this flag after those flags to also apply the patch\&. diff --git a/man1/git-diff-files.1 b/man1/git-diff-files.1 index dd1676b49..303026d75 100755 --- a/man1/git-diff-files.1 +++ b/man1/git-diff-files.1 @@ -40,6 +40,10 @@ Generate patch (see section on generating patches) \-u Synonym for "\-p"\&. +.TP +\-\-patch\-with\-raw +Generate patch but keep also the default raw diff output\&. + .TP \-z \\0 line termination on output diff --git a/man1/git-diff-index.1 b/man1/git-diff-index.1 index 5f6b504d1..9b6732710 100755 --- a/man1/git-diff-index.1 +++ b/man1/git-diff-index.1 @@ -40,6 +40,10 @@ Generate patch (see section on generating patches) \-u Synonym for "\-p"\&. +.TP +\-\-patch\-with\-raw +Generate patch but keep also the default raw diff output\&. + .TP \-z \\0 line termination on output diff --git a/man1/git-diff-stages.1 b/man1/git-diff-stages.1 index 9532e37fe..d92269979 100755 --- a/man1/git-diff-stages.1 +++ b/man1/git-diff-stages.1 @@ -40,6 +40,10 @@ Generate patch (see section on generating patches) \-u Synonym for "\-p"\&. +.TP +\-\-patch\-with\-raw +Generate patch but keep also the default raw diff output\&. + .TP \-z \\0 line termination on output diff --git a/man1/git-diff-tree.1 b/man1/git-diff-tree.1 index c431b0275..bc55a7216 100755 --- a/man1/git-diff-tree.1 +++ b/man1/git-diff-tree.1 @@ -49,6 +49,10 @@ Generate patch (see section on generating patches) \-u Synonym for "\-p"\&. +.TP +\-\-patch\-with\-raw +Generate patch but keep also the default raw diff output\&. + .TP \-z \\0 line termination on output diff --git a/man1/git-merge-tree.1 b/man1/git-merge-tree.1 new file mode 100755 index 000000000..7358c1a87 --- /dev/null +++ b/man1/git-merge-tree.1 @@ -0,0 +1,50 @@ +.\"Generated by db2man.xsl. Don't modify this, modify the source. +.de Sh \" Subsection +.br +.if t .Sp +.ne 5 +.PP +\fB\\$1\fR +.PP +.. +.de Sp \" Vertical space (when we can't use .PP) +.if t .sp .5v +.if n .sp +.. +.de Ip \" List item +.br +.ie \\n(.$>=3 .ne \\$3 +.el .ne 3 +.IP "\\$1" \\$2 +.. +.TH "GIT-MERGE-TREE" 1 "" "" "" +.SH NAME +git-merge-tree \- Show three-way merge without touching index +.SH "SYNOPSIS" + + +\fIgit\-merge\-tree\fR + +.SH "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\&. + +.SH "AUTHOR" + + +Written by Linus Torvalds + +.SH "DOCUMENTATION" + + +Documentation by Junio C Hamano and the git\-list \&. + +.SH "GIT" + + +Part of the \fBgit\fR(7) suite + diff --git a/man1/git-mktree.1 b/man1/git-mktree.1 new file mode 100755 index 000000000..da19f03f7 --- /dev/null +++ b/man1/git-mktree.1 @@ -0,0 +1,53 @@ +.\"Generated by db2man.xsl. Don't modify this, modify the source. +.de Sh \" Subsection +.br +.if t .Sp +.ne 5 +.PP +\fB\\$1\fR +.PP +.. +.de Sp \" Vertical space (when we can't use .PP) +.if t .sp .5v +.if n .sp +.. +.de Ip \" List item +.br +.ie \\n(.$>=3 .ne \\$3 +.el .ne 3 +.IP "\\$1" \\$2 +.. +.TH "GIT-MKTREE" 1 "" "" "" +.SH NAME +git-mktree \- Build a tree-object from ls-tree formatted text +.SH "SYNOPSIS" + + +\fIgit\-mktree\fR [\-z] + +.SH "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\&. + +.SH "OPTIONS" + +.TP +\-z +Read the NUL\-terminated ls\-tree \-z output instead\&. + +.SH "AUTHOR" + + +Written by Junio C Hamano + +.SH "DOCUMENTATION" + + +Documentation by Junio C Hamano and the git\-list \&. + +.SH "GIT" + + +Part of the \fBgit\fR(7) suite + diff --git a/man7/git.7 b/man7/git.7 index 4db9e3992..9b797632b 100755 --- a/man7/git.7 +++ b/man7/git.7 @@ -105,6 +105,10 @@ Runs a merge for files needing merging\&. \fBgit\-mktag\fR(1) Creates a tag object\&. +.TP +\fBgit\-mktree\fR(1) +Build a tree\-object from ls\-tree formatted text\&. + .TP \fBgit\-pack\-objects\fR(1) Creates a packed archive of objects\&. @@ -299,6 +303,10 @@ Checkout and switch to a branch\&. \fBgit\-cherry\-pick\fR(1) Cherry\-pick the effect of an existing commit\&. +.TP +\fBgit\-clean\fR(1) +Remove untracked files from the working tree\&. + .TP \fBgit\-clone\fR(1) Clones a repository into a new directory\&. @@ -371,6 +379,10 @@ Merge two commits\&. \fBgit\-revert\fR(1) Revert an existing commit\&. +.TP +\fBgit\-rm\fR(1) +Remove files from the working tree and from the index\&. + .TP \fBgit\-shortlog\fR(1) Summarizes \fIgit log\fR output\&. @@ -420,6 +432,10 @@ Salvage your data out of another SCM people love to hate\&. \fBgit\-cvsexportcommit\fR(1) Export a single commit to a CVS checkout\&. +.TP +\fBgit\-cvsserver\fR(1) +A CVS server emulator for git\&. + .TP \fBgit\-lost\-found\fR(1) Recover lost refs that luckily have not yet been pruned\&. @@ -475,10 +491,18 @@ Count unpacked number of objects and their disk consumption\&. \fBgit\-daemon\fR(1) A really simple server for git repositories\&. +.TP +\fBgit\-fmt\-merge\-msg\fR(1) +Produce a merge commit message\&. + .TP \fBgit\-get\-tar\-commit\-id\fR(1) Extract commit ID from an archive created using git\-tar\-tree\&. +.TP +\fBgit\-imap\-send\fR(1) +Dump a mailbox from stdin into an imap folder\&. + .TP \fBgit\-mailinfo\fR(1) Extracts patch and authorship information from a single e\-mail message, optionally transliterating the commit message into utf\-8\&. @@ -487,6 +511,10 @@ Extracts patch and authorship information from a single e\-mail message, optiona \fBgit\-mailsplit\fR(1) A stupid program to split UNIX mbox format mailbox into individual pieces of e\-mail\&. +.TP +\fBgit\-merge\-tree\fR(1) +Show three\-way merge without touching index\&. + .TP \fBgit\-patch\-id\fR(1) Compute unique ID for a patch\&. -- 2.26.2