From 9850e2e7bcd9be627a572ae2746af071077b254d Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 2 Nov 2007 02:48:14 +0000 Subject: [PATCH] Autogenerated manpages for v1.5.3.5-474-g3e4bb --- man1/git-clone.1 | 4 ++-- man1/git-filter-branch.1 | 4 ++-- man1/git-format-patch.1 | 4 ++-- man1/git-mergetool.1 | 6 ++++-- man7/git.7 | 2 +- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/man1/git-clone.1 b/man1/git-clone.1 index ba711fd59..01389f8b6 100644 --- a/man1/git-clone.1 +++ b/man1/git-clone.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "GIT\-CLONE" "1" "09/10/2007" "Git 1.5.3.1.27.g57543" "Git Manual" +.TH "GIT\-CLONE" "1" "11/02/2007" "Git 1.5.3.5.474.g3e4bb" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -56,7 +56,7 @@ When given, and the repository to clone from is handled by \fIgit\-fetch\-pack\f Specify the directory from which templates will be used; if unset the templates are taken from the installation defined default, typically /usr/share/git\-core/templates. .TP \-\-depth -Create a \fIshallow\fR clone with a history truncated to the specified number of revs. A shallow repository has number of limitations (you cannot clone or fetch from it, nor push from nor into it), but is adequate if you want to only look at near the tip of a large project with a long history, and would want to send in a fixes as patches. +Create a \fIshallow\fR clone with a history truncated to the specified number of revisions. A shallow repository has a number of limitations (you cannot clone or fetch from it, nor push from nor into it), but is adequate if you are only interested in the recent history of a large project with a long history, and would want to send in fixes as patches. .TP The (possibly remote) repository to clone from. See the URLS section below for more information on specifying repositories. diff --git a/man1/git-filter-branch.1 b/man1/git-filter-branch.1 index b76f4adc4..9dc228ec6 100644 --- a/man1/git-filter-branch.1 +++ b/man1/git-filter-branch.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "GIT\-FILTER\-BRANCH" "1" "10/23/2007" "Git 1.5.3.4.319.gdd817" "Git Manual" +.TH "GIT\-FILTER\-BRANCH" "1" "11/02/2007" "Git 1.5.3.5.474.g3e4bb" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -137,7 +137,7 @@ git filter\-branch \-\-commit\-filter ' .ft .fi -The function \fIskip_commits\fR is defined as follows: +The function \fIskip_commit\fR is defined as follows: .sp .nf .ft C diff --git a/man1/git-format-patch.1 b/man1/git-format-patch.1 index babfc5633..55cff62ac 100644 --- a/man1/git-format-patch.1 +++ b/man1/git-format-patch.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "GIT\-FORMAT\-PATCH" "1" "10/03/2007" "Git 1.5.3.4.203.gcc61a" "Git Manual" +.TH "GIT\-FORMAT\-PATCH" "1" "11/02/2007" "Git 1.5.3.5.474.g3e4bb" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -244,7 +244,7 @@ git\-format\-patch origin Extract all commits which are in the current branch but not in the origin branch. For each commit a separate file is created in the current directory. .TP git\-format\-patch \-\-root origin -Extract all commits which that leads to \fIorigin\fR since the inception of the project. +Extract all commits that lead to \fIorigin\fR since the inception of the project. .TP git\-format\-patch \-M \-B origin The same as the previous one. Additionally, it detects and handles renames and complete rewrites intelligently to produce a renaming patch. A renaming patch reduces the amount of text output, and generally makes it easier to review it. Note that the "patch" program does not understand renaming patches, so use it only when you know the recipient uses git to apply your patch. diff --git a/man1/git-mergetool.1 b/man1/git-mergetool.1 index c16376b47..c25ef3798 100644 --- a/man1/git-mergetool.1 +++ b/man1/git-mergetool.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "GIT\-MERGETOOL" "1" "07/19/2007" "Git 1.5.3.rc2.19.gc4fba" "Git Manual" +.TH "GIT\-MERGETOOL" "1" "11/02/2007" "Git 1.5.3.5.474.g3e4bb" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -18,9 +18,11 @@ If one or more parameters are given, the merge tool program will be run t .SH "OPTIONS" .TP \-t or \-\-tool= -Use the merge resolution program specified by . Valid merge tools are: kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, and opendiff +Use the merge resolution program specified by . Valid merge tools are: kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, ecmerge, and opendiff If a merge resolution program is not specified, \fIgit mergetool\fR will use the configuration variable merge.tool. If the configuration variable merge.tool is not set, \fIgit mergetool\fR will pick a suitable default. + +You can explicitly provide a full path to the tool by setting the configuration variable mergetool..path. For example, you can configure the absolute path to kdiff3 by setting mergetool.kdiff3.path. Otherwise, \fIgit mergetool\fR assumes the tool is available in PATH. .SH "AUTHOR" Written by Theodore Y Ts'o .SH "DOCUMENTATION" diff --git a/man7/git.7 b/man7/git.7 index e398e79b5..70c3866d7 100644 --- a/man7/git.7 +++ b/man7/git.7 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "GIT" "7" "10/31/2007" "Git 1.5.3.4.498.g9c514" "Git Manual" +.TH "GIT" "7" "11/02/2007" "Git 1.5.3.5.474.g3e4bb" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) -- 2.26.2