From 3db8b41b7fb7b11cc6fd575309e9906f173d2cd7 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 26 Jul 2008 06:45:59 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.6.0-rc0-79-gb0320 --- config.txt | 3 ++- git-checkout.html | 4 ++-- git-checkout.txt | 2 +- git-clone.html | 11 +++++------ git-clone.txt | 9 ++++----- git-config.html | 5 +++-- git-tag.html | 5 +++-- git-tag.txt | 3 ++- 8 files changed, 22 insertions(+), 20 deletions(-) diff --git a/config.txt b/config.txt index e7848055a..798b55151 100644 --- a/config.txt +++ b/config.txt @@ -358,7 +358,8 @@ core.whitespace:: A comma separated list of common whitespace problems to notice. 'git-diff' will use `color.diff.whitespace` to highlight them, and 'git-apply --whitespace=error' will - consider them as errors: + consider them as errors. You can prefix `-` to disable + any of them (e.g. `-trailing-space`): + * `trailing-space` treats trailing whitespaces at the end of the line as an error (enabled by default). diff --git a/git-checkout.html b/git-checkout.html index 22230f0cc..f997d75f6 100644 --- a/git-checkout.html +++ b/git-checkout.html @@ -322,7 +322,7 @@ git-checkout(1) Manual Page
git checkout [-q] [-f] [[--track | --no-track] -b <new_branch> [-l]] [-m] [<branch>] -git checkout [<tree-ish>] <paths>…
+git checkout [<tree-ish>] [--] <paths>…

DESCRIPTION

@@ -590,7 +590,7 @@ $ git add frotz
diff --git a/git-checkout.txt b/git-checkout.txt index 2abfbdaad..5aa69c0e1 100644 --- a/git-checkout.txt +++ b/git-checkout.txt @@ -9,7 +9,7 @@ SYNOPSIS -------- [verse] 'git checkout' [-q] [-f] [[--track | --no-track] -b [-l]] [-m] [] -'git checkout' [] ... +'git checkout' [] [--] ... DESCRIPTION ----------- diff --git a/git-clone.html b/git-clone.html index 4b8ba1d74..bcca160e9 100644 --- a/git-clone.html +++ b/git-clone.html @@ -422,8 +422,8 @@ then the cloned repository will become corrupt.

- Operate quietly. This flag is passed to "rsync" and - git-fetch-pack commands when given. + Operate quietly. This flag is also passed to the `rsync' + command when given.

@@ -474,9 +474,8 @@ then the cloned repository will become corrupt.

- When given, and the repository to clone from is handled - by git-fetch-pack, --exec=<upload-pack> is passed to - the command to specify non-default path for the command + When given, and the repository to clone from is accessed + via ssh, this specifies a non-default path for the command run on the other end.

@@ -716,7 +715,7 @@ Create a repository on the kernel.org machine that borrows from Linus diff --git a/git-clone.txt b/git-clone.txt index 91efac920..26fd1b111 100644 --- a/git-clone.txt +++ b/git-clone.txt @@ -87,8 +87,8 @@ then the cloned repository will become corrupt. --quiet:: -q:: - Operate quietly. This flag is passed to "rsync" and - 'git-fetch-pack' commands when given. + Operate quietly. This flag is also passed to the `rsync' + command when given. --no-checkout:: -n:: @@ -113,9 +113,8 @@ then the cloned repository will become corrupt. --upload-pack :: -u :: - When given, and the repository to clone from is handled - by 'git-fetch-pack', `--exec=` is passed to - the command to specify non-default path for the command + When given, and the repository to clone from is accessed + via ssh, this specifies a non-default path for the command run on the other end. --template=:: diff --git a/git-config.html b/git-config.html index 7a2a3ae88..ef0513f26 100644 --- a/git-config.html +++ b/git-config.html @@ -1198,7 +1198,8 @@ core.whitespace A comma separated list of common whitespace problems to notice. git-diff will use color.diff.whitespace to highlight them, and git-apply --whitespace=error will - consider them as errors: + consider them as errors. You can prefix - to disable + any of them (e.g. -trailing-space):

  • @@ -2685,7 +2686,7 @@ web.browser
diff --git a/git-tag.html b/git-tag.html index 0603ecf5b..0afeacc41 100644 --- a/git-tag.html +++ b/git-tag.html @@ -321,7 +321,8 @@ git-tag(1) Manual Page

SYNOPSIS

-
git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <name> [<head>] +
git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] + <name> [<commit> | <object>] git tag -d <name>… git tag [-n[<num>]] -l [<pattern>] git tag -v <name>…
@@ -600,7 +601,7 @@ Junio C Hamano <gitster@pobox.com> and Chris Wright <chrisw@osdl.org>
diff --git a/git-tag.txt b/git-tag.txt index b8dc88fa3..046ab3542 100644 --- a/git-tag.txt +++ b/git-tag.txt @@ -9,7 +9,8 @@ git-tag - Create, list, delete or verify a tag object signed with GPG SYNOPSIS -------- [verse] -'git tag' [-a | -s | -u ] [-f] [-m | -F ] [] +'git tag' [-a | -s | -u ] [-f] [-m | -F ] + [ | ] 'git tag' -d ... 'git tag' [-n[]] -l [] 'git tag' -v ... -- 2.26.2