From: Junio C Hamano Date: Tue, 13 Feb 2007 05:16:23 +0000 (+0000) Subject: Autogenerated HTML docs for v1.5.0-rc4-359-g07fe X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5dad0838933088ec5053644099611e05dc078fec;p=git.git Autogenerated HTML docs for v1.5.0-rc4-359-g07fe --- diff --git a/git-fast-import.html b/git-fast-import.html index 4a20ade1e..49d812717 100644 --- a/git-fast-import.html +++ b/git-fast-import.html @@ -663,16 +663,15 @@ that was selected by the --date-format=<fmt> command line option. See “Date Formats” above for the set of supported formats, and their syntax.

from

-

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.

-

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.

+

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 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 <committish>.

Here <committish> is any of the following:

@@ -1189,7 +1188,7 @@ memory footprint (less than 2.7 MiB per active branch).

diff --git a/git-fast-import.txt b/git-fast-import.txt index 939ec4652..445f6b854 100644 --- a/git-fast-import.txt +++ b/git-fast-import.txt @@ -349,17 +349,16 @@ their syntax. `from` ^^^^^^ -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. - -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. +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 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/git-merge.html b/git-merge.html index 2426cac1b..34c16dec1 100644 --- a/git-merge.html +++ b/git-merge.html @@ -274,7 +274,7 @@ git-merge(1) Manual Page
git-merge [-n] [--no-commit] [--squash] [-s <strategy>]… - -m=<msg> <remote> <remote>…
+ [-m <msg>] <remote> <remote>…

DESCRIPTION

@@ -570,7 +570,7 @@ Resolve the conflicts. git-diff would report only the
diff --git a/git-merge.txt b/git-merge.txt index 3c08a6f7d..e53ff4b4e 100644 --- a/git-merge.txt +++ b/git-merge.txt @@ -10,7 +10,7 @@ SYNOPSIS -------- [verse] 'git-merge' [-n] [--no-commit] [--squash] [-s ]... - -m= ... + [-m ] ... DESCRIPTION ----------- diff --git a/git.html b/git.html index ea92c2857..237c6d545 100644 --- a/git.html +++ b/git.html @@ -2296,7 +2296,7 @@ contributors on the git-list <git@vger.kernel.org>.