From eb2b2beac5ef41c73ae3441c9df7b457d428d72a Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 13 Feb 2007 05:16:39 +0000 Subject: [PATCH] Autogenerated man pages for v1.5.0-rc4-359-g07fe --- man1/git-fast-import.1 | 6 +++--- man1/git-merge.1 | 4 ++-- man7/git.7 | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/man1/git-fast-import.1 b/man1/git-fast-import.1 index 2c926117a..9e4785c98 100644 --- a/man1/git-fast-import.1 +++ b/man1/git-fast-import.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\-FAST\-IMPORT" "1" "02/12/2007" "" "" +.TH "GIT\-FAST\-IMPORT" "1" "02/13/2007" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -167,9 +167,9 @@ The time of the change is specified by using the date format that was sel .br \fBfrom\fR .RS 3 -Only valid for the first commit made on this branch by this fast\-import process. The from command is used to specify the commit to initialize this branch from. This revision will be the first ancestor of the new commit. +The from command is used to specify the commit to initialize this branch from. This revision will be the first ancestor of the new commit. -Omitting the from command in the first commit of a new branch will cause fast\-import to create that commit with no ancestor. This tends to be desired only for the initial commit of a project. Omitting the from command on existing branches is required, as the current commit on that branch is automatically assumed to be the first ancestor of the new commit. +Omitting the from command in the first commit of a new branch will cause fast\-import to create that commit with no ancestor. This tends to be desired only for the initial commit of a project. Omitting the from command on existing branches is usually desired, as the current commit on that branch is automatically assumed to be the first ancestor of the new commit. As LF is not valid in a Git refname or SHA\-1 expression, no quoting or escaping syntax is supported within . diff --git a/man1/git-merge.1 b/man1/git-merge.1 index ba28903ef..04db8a523 100644 --- a/man1/git-merge.1 +++ b/man1/git-merge.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\-MERGE" "1" "01/19/2007" "" "" +.TH "GIT\-MERGE" "1" "02/13/2007" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -13,7 +13,7 @@ git\-merge \- Join two or more development histories together .sp .nf \fIgit\-merge\fR [\-n] [\-\-no\-commit] [\-\-squash] [\-s ]\&... - \-m= \&... + [\-m ] \&... .fi .SH "DESCRIPTION" This is the top\-level interface to the merge machinery which drives multiple merge strategy scripts. diff --git a/man7/git.7 b/man7/git.7 index 7d2fb722f..c5a3d6d26 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" "02/12/2007" "" "" +.TH "GIT" "7" "02/13/2007" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) -- 2.26.2