From e58607f49ae156d2e441edd280f99219614f52a8 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 17 Jan 2007 23:27:45 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.5.0-rc1-gde38 --- git-applypatch.html | 4 +++- git-applypatch.txt | 3 +++ git-blame.html | 9 ++++++--- git-blame.txt | 5 ++++- git-commit-tree.html | 4 +++- git-commit-tree.txt | 3 +++ git-fetch-pack.html | 4 +++- git-fetch-pack.txt | 3 +++ git-mailinfo.html | 4 ++-- git-mailinfo.txt | 2 +- git-parse-remote.html | 8 +++++--- git-parse-remote.txt | 6 ++++-- git-resolve.html | 3 ++- git-resolve.txt | 2 ++ git-send-pack.html | 4 +++- git-send-pack.txt | 3 +++ 16 files changed, 50 insertions(+), 17 deletions(-) diff --git a/git-applypatch.html b/git-applypatch.html index 54693ae27..1574b3481 100644 --- a/git-applypatch.html +++ b/git-applypatch.html @@ -276,6 +276,8 @@ git-applypatch(1) Manual Page

DESCRIPTION

+

This is usually not what an end user wants to run directly. See +git-am(1) instead.

Takes three files <msg>, <patch>, and <info> prepared from an e-mail message by git-mailinfo, and creates a commit. It is usually not necessary to use this command directly.

@@ -329,7 +331,7 @@ information.

diff --git a/git-applypatch.txt b/git-applypatch.txt index 2b1ff1454..451434a75 100644 --- a/git-applypatch.txt +++ b/git-applypatch.txt @@ -12,6 +12,9 @@ SYNOPSIS DESCRIPTION ----------- +This is usually not what an end user wants to run directly. See +gitlink:git-am[1] instead. + Takes three files , , and prepared from an e-mail message by 'git-mailinfo', and creates a commit. It is usually not necessary to use this command directly. diff --git a/git-blame.html b/git-blame.html index 0b64a3fee..2e03242df 100644 --- a/git-blame.html +++ b/git-blame.html @@ -461,10 +461,13 @@ header elements later.

Unlike git-blame and git-annotate in older git, the extent of annotation can be limited to both line ranges and revision ranges. When you are interested in finding the origin for -ll. 40-60 for file foo, you can use -L option like this:

+ll. 40-60 for file foo, you can use -L option like these +(they mean the same thing — both ask for 21 lines starting at +line 40):

-
git blame -L 40,60 foo
+
git blame -L 40,60 foo
+git blame -L 40,+21 foo

Also you can use regular expression to specify the line range.

@@ -515,7 +518,7 @@ parents, using commit^! notation:

diff --git a/git-blame.txt b/git-blame.txt index b14e79407..5dd8e36bb 100644 --- a/git-blame.txt +++ b/git-blame.txt @@ -118,9 +118,12 @@ SPECIFYING RANGES Unlike `git-blame` and `git-annotate` in older git, the extent of annotation can be limited to both line ranges and revision ranges. When you are interested in finding the origin for -ll. 40-60 for file `foo`, you can use `-L` option like this: +ll. 40-60 for file `foo`, you can use `-L` option like these +(they mean the same thing -- both ask for 21 lines starting at +line 40): git blame -L 40,60 foo + git blame -L 40,+21 foo Also you can use regular expression to specify the line range. diff --git a/git-commit-tree.html b/git-commit-tree.html index a68db3628..c40f13d27 100644 --- a/git-commit-tree.html +++ b/git-commit-tree.html @@ -276,6 +276,8 @@ git-commit-tree(1) Manual Page

DESCRIPTION

+

This is usually not what an end user wants to run directly. See +git-commit(1) instead.

Creates a new commit object based on the provided tree object and emits the new commit object id on stdout. If no parent is given then it is considered to be an initial tree.

@@ -478,7 +480,7 @@ reversible operation.

diff --git a/git-commit-tree.txt b/git-commit-tree.txt index 77ba96ed8..f5d8050c9 100644 --- a/git-commit-tree.txt +++ b/git-commit-tree.txt @@ -12,6 +12,9 @@ SYNOPSIS DESCRIPTION ----------- +This is usually not what an end user wants to run directly. See +gitlink:git-commit[1] instead. + Creates a new commit object based on the provided tree object and emits the new commit object id on stdout. If no parent is given then it is considered to be an initial tree. diff --git a/git-fetch-pack.html b/git-fetch-pack.html index 99a307c4b..12c00f3b8 100644 --- a/git-fetch-pack.html +++ b/git-fetch-pack.html @@ -276,6 +276,8 @@ git-fetch-pack(1) Manual Page

DESCRIPTION

+

Usually you would want to use git-fetch(1) which is a +higher level wrapper of this command instead.

Invokes git-upload-pack on a potentially remote repository, and asks it to send objects missing from this repository, to update the named heads. The list of commits available locally @@ -369,7 +371,7 @@ have a common ancestor commit.

diff --git a/git-fetch-pack.txt b/git-fetch-pack.txt index 3e6cd880b..90ef127d1 100644 --- a/git-fetch-pack.txt +++ b/git-fetch-pack.txt @@ -12,6 +12,9 @@ SYNOPSIS DESCRIPTION ----------- +Usually you would want to use gitlink:git-fetch[1] which is a +higher level wrapper of this command instead. + Invokes 'git-upload-pack' on a potentially remote repository, and asks it to send objects missing from this repository, to update the named heads. The list of commits available locally diff --git a/git-mailinfo.html b/git-mailinfo.html index 8eb768e1c..a0d11a5cb 100644 --- a/git-mailinfo.html +++ b/git-mailinfo.html @@ -281,7 +281,7 @@ writes the commit log message in <msg> file, and the patches in <patch> file. The author name, e-mail and e-mail subject are written out to the standard output to be used by git-applypatch to create a commit. It is usually not necessary to use this -command directly.

+command directly. See git-am(1) instead.

OPTIONS

@@ -357,7 +357,7 @@ Junio C Hamano <junkio@cox.net>

diff --git a/git-mailinfo.txt b/git-mailinfo.txt index 5088bbea8..1ff6e7d6c 100644 --- a/git-mailinfo.txt +++ b/git-mailinfo.txt @@ -18,7 +18,7 @@ writes the commit log message in file, and the patches in file. The author name, e-mail and e-mail subject are written out to the standard output to be used by git-applypatch to create a commit. It is usually not necessary to use this -command directly. +command directly. See gitlink:git-am[1] instead. OPTIONS diff --git a/git-parse-remote.html b/git-parse-remote.html index dece80c36..10789f5bd 100644 --- a/git-parse-remote.html +++ b/git-parse-remote.html @@ -278,7 +278,8 @@ git-parse-remote(1) Manual Page

This script is included in various scripts to supply routines to parse files under $GIT_DIR/remotes/ and -$GIT_DIR/branches/.

+$GIT_DIR/branches/ and configuration variables that are related +to fetching, pulling and pushing.

The primary entry points are:

@@ -292,7 +293,8 @@ get_remote_refs_for_fetch (e.g. refs/heads/foo). When <refspec>… is empty the returned list of refs consists of the defaults for the given <repo>, if specified in - $GIT_DIR/remotes/ or $GIT_DIR/branches/. + $GIT_DIR/remotes/, $GIT_DIR/branches/, or remote.*.fetch + configuration.

@@ -324,7 +326,7 @@ get_remote_refs_for_push
diff --git a/git-parse-remote.txt b/git-parse-remote.txt index fc27afe26..918ca55f5 100644 --- a/git-parse-remote.txt +++ b/git-parse-remote.txt @@ -14,7 +14,8 @@ DESCRIPTION ----------- This script is included in various scripts to supply routines to parse files under $GIT_DIR/remotes/ and -$GIT_DIR/branches/. +$GIT_DIR/branches/ and configuration variables that are related +to fetching, pulling and pushing. The primary entry points are: @@ -25,7 +26,8 @@ get_remote_refs_for_fetch:: (e.g. `refs/heads/foo`). When `...` is empty the returned list of refs consists of the defaults for the given ``, if specified in - `$GIT_DIR/remotes/` or `$GIT_DIR/branches/`. + `$GIT_DIR/remotes/`, `$GIT_DIR/branches/`, or `remote.*.fetch` + configuration. get_remote_refs_for_push:: Given the list of user-supplied ` ...`, diff --git a/git-resolve.html b/git-resolve.html index 7c89c0329..2d2daac4d 100644 --- a/git-resolve.html +++ b/git-resolve.html @@ -276,6 +276,7 @@ git-resolve(1) Manual Page

DESCRIPTION

+

DEPRECATED. Use git-merge instead.

Given two commits and a merge message, merge the <merged> commit into <current> commit, with the commit log message <message>.

When <current> is a descendant of <merged>, or <current> is an @@ -298,7 +299,7 @@ Dan Holmsand <holmsand@gmail.com>.

diff --git a/git-resolve.txt b/git-resolve.txt index 4e57c2b28..0925973f1 100644 --- a/git-resolve.txt +++ b/git-resolve.txt @@ -12,6 +12,8 @@ SYNOPSIS DESCRIPTION ----------- +DEPRECATED. Use `git-merge` instead. + Given two commits and a merge message, merge the commit into commit, with the commit log message . diff --git a/git-send-pack.html b/git-send-pack.html index 2da40382b..dc9936b8d 100644 --- a/git-send-pack.html +++ b/git-send-pack.html @@ -276,6 +276,8 @@ git-send-pack(1) Manual Page

DESCRIPTION

+

Usually you would want to use git-push(1) which is a +higher level wrapper of this command instead.

Invokes git-receive-pack on a possibly remote repository, and updates it from the current repository, sending named refs.

@@ -416,7 +418,7 @@ to disable the fast-forward check only on that ref.

diff --git a/git-send-pack.txt b/git-send-pack.txt index 5376f6854..88f4e394e 100644 --- a/git-send-pack.txt +++ b/git-send-pack.txt @@ -12,6 +12,9 @@ SYNOPSIS DESCRIPTION ----------- +Usually you would want to use gitlink:git-push[1] which is a +higher level wrapper of this command instead. + Invokes 'git-receive-pack' on a possibly remote repository, and updates it from the current repository, sending named refs. -- 2.26.2