From 1bb569ec8189e0498dc17c57e9237ffd85beb273 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 5 May 2006 23:14:25 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.3.2-g8611 --- git-add.html | 4 ++-- git-add.txt | 2 +- git-checkout-index.html | 4 ++-- git-checkout-index.txt | 2 +- git-cherry.html | 18 ++++++++++++------ git-cherry.txt | 19 ++++++++++++++----- git-clone.html | 6 ++++-- git-clone.txt | 2 +- git-commit.html | 4 ++-- git-commit.txt | 2 +- git-imap-send.html | 25 ++++++++++++------------- git-imap-send.txt | 4 +++- git-log.html | 4 ++-- git-log.txt | 2 +- git-ls-files.html | 4 ++-- git-ls-files.txt | 2 +- git-merge-index.html | 8 ++++---- git-merge-index.txt | 4 ++-- git-name-rev.html | 5 +++-- git-name-rev.txt | 1 + git-prune.html | 6 +++--- git-prune.txt | 2 +- git-repack.html | 3 ++- git-repack.txt | 1 + git-repo-config.html | 8 ++++---- git-repo-config.txt | 6 +++--- git-reset.html | 6 ++++-- git-reset.txt | 2 +- git-rm.html | 4 ++-- git-rm.txt | 2 +- git-unpack-objects.html | 13 +++++++++---- git-unpack-objects.txt | 13 ++++++++++--- git-update-index.html | 4 ++-- git-update-index.txt | 2 +- git-verify-pack.html | 4 ++-- git-verify-pack.txt | 2 +- git-whatchanged.html | 4 ++-- git-whatchanged.txt | 2 +- gitk.html | 6 +++--- gitk.txt | 2 +- 40 files changed, 125 insertions(+), 89 deletions(-) diff --git a/git-add.html b/git-add.html index 7c63b244..d7859cc2 100644 --- a/git-add.html +++ b/git-add.html @@ -307,7 +307,7 @@ for people used to do "cvs add".

-— +--

@@ -385,7 +385,7 @@ git-add git-*.sh

diff --git a/git-add.txt b/git-add.txt index ae24547c..5e311294 100644 --- a/git-add.txt +++ b/git-add.txt @@ -26,7 +26,7 @@ OPTIONS -v:: Be verbose. ---:: +\--:: This option can be used to separate command-line options from the list of files, (useful when filenames might be mistaken for command-line options). diff --git a/git-checkout-index.html b/git-checkout-index.html index b2e1a2ac..2824db55 100644 --- a/git-checkout-index.html +++ b/git-checkout-index.html @@ -379,7 +379,7 @@ git-checkout-index(1) Manual Page

-— +--

@@ -511,7 +511,7 @@ Junio C Hamano and the git-list <git@vger.kernel.org>.

diff --git a/git-checkout-index.txt b/git-checkout-index.txt index 09bd6a55..765c173e 100644 --- a/git-checkout-index.txt +++ b/git-checkout-index.txt @@ -63,7 +63,7 @@ OPTIONS Only meaningful with `--stdin`; paths are separated with NUL character instead of LF. ---:: +\--:: Do not interpret any more arguments as options. The order of the flags used to matter, but not anymore. diff --git a/git-cherry.html b/git-cherry.html index c3680286..39a365b6 100644 --- a/git-cherry.html +++ b/git-cherry.html @@ -276,11 +276,17 @@ git-cherry(1) Manual Page

DESCRIPTION

-

Each commit between the fork-point and <head> is examined, and compared against -the change each commit between the fork-point and <upstream> introduces. -Commits already included in upstream are prefixed with - (meaning "drop from -my local pull"), while commits missing from upstream are prefixed with + -(meaning "add to the updated upstream").

+

The changeset (or "diff") of each commit between the fork-point and <head> +is compared against each commit between the fork-point and <upstream>.

+

Every commit with a changeset that doesn't exist in the other branch +has its id (sha1) reported, prefixed by a symbol. Those existing only +in the <upstream> branch are prefixed with a minus (-) sign, and those +that only exist in the <head> branch are prefixed with a plus (+) symbol.

+

Because git-cherry compares the changeset rather than the commit id +(sha1), you can use git-cherry to find out if a commit you made locally +has been applied <upstream> under a different commit id. For example, +this will happen if you're feeding patches <upstream> via email rather +than pushing or pulling commits directly.

OPTIONS

@@ -325,7 +331,7 @@ my local pull"), while commits missing from upstream are prefixed with + diff --git a/git-cherry.txt b/git-cherry.txt index 9a5e3718..893baaa6 100644 --- a/git-cherry.txt +++ b/git-cherry.txt @@ -11,11 +11,20 @@ SYNOPSIS DESCRIPTION ----------- -Each commit between the fork-point and is examined, and compared against -the change each commit between the fork-point and introduces. -Commits already included in upstream are prefixed with '-' (meaning "drop from -my local pull"), while commits missing from upstream are prefixed with '+' -(meaning "add to the updated upstream"). +The changeset (or "diff") of each commit between the fork-point and +is compared against each commit between the fork-point and . + +Every commit with a changeset that doesn't exist in the other branch +has its id (sha1) reported, prefixed by a symbol. Those existing only +in the branch are prefixed with a minus (-) sign, and those +that only exist in the branch are prefixed with a plus (+) symbol. + +Because git-cherry compares the changeset rather than the commit id +(sha1), you can use git-cherry to find out if a commit you made locally +has been applied under a different commit id. For example, +this will happen if you're feeding patches via email rather +than pushing or pulling commits directly. + OPTIONS ------- diff --git a/git-clone.html b/git-clone.html index 1d3b4512..1e4994a3 100644 --- a/git-clone.html +++ b/git-clone.html @@ -423,7 +423,9 @@ branch you are currently working on. Remote branches other than

-

Examples

+ +

Examples

+
Clone from upstream @@ -494,7 +496,7 @@ Create a repository on the kernel.org machine that borrows from Linus
diff --git a/git-clone.txt b/git-clone.txt index 131e4457..b333f510 100644 --- a/git-clone.txt +++ b/git-clone.txt @@ -101,7 +101,7 @@ OPTIONS is not allowed. Examples -~~~~~~~~ +-------- Clone from upstream:: + diff --git a/git-commit.html b/git-commit.html index ff315aaa..06757e28 100644 --- a/git-commit.html +++ b/git-commit.html @@ -427,7 +427,7 @@ information.

-— +--

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

diff --git a/git-commit.txt b/git-commit.txt index 0a7365b9..38df59ce 100644 --- a/git-commit.txt +++ b/git-commit.txt @@ -106,7 +106,7 @@ but can be used to amend a merge commit. index and the latest commit does not match on the specified paths to avoid confusion. ---:: +\--:: Do not interpret any more arguments as options. ...:: diff --git a/git-imap-send.html b/git-imap-send.html index aee9c168..2b68e597 100644 --- a/git-imap-send.html +++ b/git-imap-send.html @@ -289,18 +289,17 @@ files directly.

configuration file (shown with examples):

-
Folder = "INBOX.Drafts"
-
-
-
-
Tunnel = "ssh -q user@server.com /usr/bin/imapd ./Maildir 2> /dev/null"
-
-
-
-
Host = imap.server.com
-User = bob
-Password = pwd
-Port = 143
+
[imap]
+    Folder = "INBOX.Drafts"
+
+[imap]
+    Tunnel = "ssh -q user@server.com /usr/bin/imapd ./Maildir 2> /dev/null"
+
+[imap]
+    Host = imap.server.com
+    User = bob
+    Pass = pwd
+    Port = 143

BUGS

@@ -321,7 +320,7 @@ Port = 143 diff --git a/git-imap-send.txt b/git-imap-send.txt index cfc0d88d..eca9e9cc 100644 --- a/git-imap-send.txt +++ b/git-imap-send.txt @@ -29,6 +29,7 @@ CONFIGURATION git-imap-send requires the following values in the repository configuration file (shown with examples): +.......................... [imap] Folder = "INBOX.Drafts" @@ -38,8 +39,9 @@ configuration file (shown with examples): [imap] Host = imap.server.com User = bob - Password = pwd + Pass = pwd Port = 143 +.......................... BUGS diff --git a/git-log.html b/git-log.html index d320426b..4c8d3c00 100644 --- a/git-log.html +++ b/git-log.html @@ -349,7 +349,7 @@ git log v2.6.12.. include/scsi drivers/scsi

-git log --since="2 weeks ago" — gitk +git log --since="2 weeks ago" -- gitk

@@ -384,7 +384,7 @@ git log -r --name-status release..test

diff --git a/git-log.txt b/git-log.txt index af378ffc..c9ffff73 100644 --- a/git-log.txt +++ b/git-log.txt @@ -51,7 +51,7 @@ git log v2.6.12.. include/scsi drivers/scsi:: Show all commits since version 'v2.6.12' that changed any file in the include/scsi or drivers/scsi subdirectories -git log --since="2 weeks ago" -- gitk:: +git log --since="2 weeks ago" \-- gitk:: Show the changes during the last two weeks to the file 'gitk'. The "--" is necessary to avoid confusion with the *branch* named diff --git a/git-ls-files.html b/git-ls-files.html index 396a0ef0..ec6f1d8c 100644 --- a/git-ls-files.html +++ b/git-ls-files.html @@ -510,7 +510,7 @@ other

-— +--

@@ -678,7 +678,7 @@ otherwise, it is a shell glob pattern, suitable for

diff --git a/git-ls-files.txt b/git-ls-files.txt index 796d049b..a29c633c 100644 --- a/git-ls-files.txt +++ b/git-ls-files.txt @@ -106,7 +106,7 @@ OPTIONS lines, show only handful hexdigits prefix. Non default number of digits can be specified with --abbrev=. ---:: +\--:: Do not interpret any more arguments as options. :: diff --git a/git-merge-index.html b/git-merge-index.html index 28b50e4a..f2235fea 100644 --- a/git-merge-index.html +++ b/git-merge-index.html @@ -3,7 +3,7 @@ - +