From cf9c77377796343e741a25077f837f607513c7bb Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 28 Oct 2022 11:56:06 -0700 Subject: Autogenerated HTML docs for v2.38.1-280-g63bba --- RelNotes/2.39.0.txt | 30 ++++++++++++++--------------- git-annotate.html | 4 ++-- git-annotate.txt | 2 +- git-clean.html | 12 ++++++------ git-clean.txt | 10 +++++----- git-commit-graph.html | 7 +++++-- git-commit-graph.txt | 5 ++++- git-credential-cache--daemon.html | 6 +++--- git-credential-cache--daemon.txt | 4 ++-- git-diff-files.html | 4 ++-- git-diff-files.txt | 2 +- git-fast-export.html | 4 ++-- git-fast-export.txt | 2 +- git-hash-object.html | 5 +++-- git-hash-object.txt | 3 ++- git-interpret-trailers.html | 7 ++++--- git-interpret-trailers.txt | 5 +++-- git-merge-base.html | 6 +++--- git-merge-base.txt | 4 ++-- git-mv.html | 6 +++--- git-mv.txt | 4 ++-- git-pack-redundant.html | 4 ++-- git-pack-redundant.txt | 2 +- git-prune-packed.html | 4 ++-- git-prune-packed.txt | 2 +- git-read-tree.html | 4 ++-- git-read-tree.txt | 2 +- git-receive-pack.html | 6 +++--- git-receive-pack.txt | 4 ++-- git-reflog.html | 24 ++++++++++------------- git-reflog.txt | 17 +++++++--------- git-rerere.html | 4 ++-- git-rerere.txt | 2 +- git-rev-list.html | 4 ++-- git-rev-list.txt | 2 +- git-send-pack.html | 7 ++++--- git-send-pack.txt | 5 +++-- git-show-branch.html | 6 +++--- git-show-branch.txt | 4 ++-- git-show-ref.html | 6 +++--- git-show-ref.txt | 4 ++-- git-sparse-checkout.html | 4 ++-- git-sparse-checkout.txt | 2 +- git-stash.html | 19 ++++++++++-------- git-stash.txt | 17 +++++++++------- git-status.html | 4 ++-- git-status.txt | 2 +- git-tag.html | 20 +++++++++---------- git-tag.txt | 18 ++++++++--------- git-update-server-info.html | 22 +++++++++++++++++++-- git-update-server-info.txt | 8 +++++++- git-upload-archive.html | 6 +++--- git-upload-archive.txt | 4 ++-- git-var.html | 4 ++-- git-var.txt | 2 +- git-verify-commit.html | 4 ++-- git-verify-commit.txt | 2 +- git-verify-pack.html | 4 ++-- git-verify-pack.txt | 2 +- git-verify-tag.html | 4 ++-- git-verify-tag.txt | 2 +- git-worktree.html | 5 +++-- git-worktree.txt | 3 ++- howto/coordinate-embargoed-releases.html | 2 +- howto/keep-canonical-history-correct.html | 2 +- howto/maintain-git.html | 2 +- howto/new-command.html | 2 +- howto/rebase-from-internal-branch.html | 2 +- howto/rebuild-from-update-hook.html | 2 +- howto/recover-corrupted-blob-object.html | 2 +- howto/recover-corrupted-object-harder.html | 2 +- howto/revert-a-faulty-merge.html | 2 +- howto/revert-branch-rebase.html | 2 +- howto/separating-topic-branches.html | 2 +- howto/setup-git-server-over-http.html | 2 +- howto/update-hook-example.html | 2 +- howto/use-git-daemon.html | 2 +- howto/using-merge-subtree.html | 2 +- howto/using-signed-tag-in-pull-request.html | 2 +- 79 files changed, 236 insertions(+), 199 deletions(-) diff --git a/RelNotes/2.39.0.txt b/RelNotes/2.39.0.txt index 4b5c544bd..f87c4c442 100644 --- a/RelNotes/2.39.0.txt +++ b/RelNotes/2.39.0.txt @@ -75,14 +75,12 @@ Fixes since v2.38 * Documentation on various Boolean GIT_* environment variables have been clarified. - (merge 819fb68222 jc/environ-docs later to maint). * "git rebase -i" can mistakenly attempt to apply a fixup to a commit itself, which has been corrected. * "git multi-pack-index repack/expire" used to repack unreachable cruft into a new pack, which have been corrected. - (merge b62ad5681f tb/midx-repack-ignore-cruft-packs later to maint). * In read-only repositories, "git merge-tree" tried to come up with a merge result tree object, which it failed (which is not wrong) and @@ -105,22 +103,17 @@ Fixes since v2.38 * The code to clean temporary object directories (used for quarantine) tried to remove them inside its signal handler, which was a no-no. - (merge 22613b25ec jc/tmp-objdir later to maint). * Update comment in the Makefile about the RUNTIME_PREFIX config knob. - (merge ebb6c16607 dd/document-runtime-prefix-better later to maint). * Clarify that "the sentence after : prefix does not begin with a capital letter" rule applies only to the commit title. - (merge 3991bb73dd jc/use-of-uc-in-log-messages later to maint). * "git branch --edit-description" on an unborh branch misleadingly said that no such branch exists, which has been corrected. - (merge bcfc82bd48 rj/branch-edit-desc-unborn later to maint). * Work around older clang that warns against C99 zero initialization syntax for struct. - (merge 54795d37d9 jh/struct-zero-init-with-older-clang later to maint). * Giving "--invert-grep" and "--all-match" without "--grep" to the "git log" command resulted in an attempt to access grep pattern @@ -154,14 +147,21 @@ Fixes since v2.38 * Update to build procedure with VS using CMake/CTest. (merge c858750b41 js/cmake-updates later to maint). + * The short-help text shown by "git cmd -h" and the synopsis text + shown at the beginning of "git help cmd" have been made more + consistent. + + * When creating a multi-pack bitmap, remove per-pack bitmap files + unconditionally as they will never be consulted. + (merge 55d902cd61 tb/remove-unused-pack-bitmap later to maint). + + * Fix a longstanding syntax error in Git.pm error codepath. + + * "git diff --stat" etc. were invented back when everything was ASCII + and strlen() was a way to measure the display width of a string; + adjust them to compute the display width assuming UTF-8 pathnames. + (merge ce8529b2bb tb/diffstat-with-utf8-strwidth later to maint). + * Other code cleanup, docfix, build fix, etc. - (merge c34a6bd291 so/diff-merges-cleanup later to maint). - (merge 2a905f8fa8 ah/branch-autosetupmerge-grammofix later to maint). - (merge abcac2e19f rj/ref-filter-get-head-description-leakfix later to maint). - (merge 71e5473493 hn/parse-worktree-ref later to maint). - (merge 7c07f36ad2 ab/unused-annotation later to maint). - (merge f7669676d0 rs/use-fspathncmp later to maint). - (merge a677d3c416 pw/remove-rebase-p-test later to maint). - (merge e3733b646d rs/archive-dedup-printf later to maint). (merge 413bc6d20a ds/cmd-main-reorder later to maint). (merge 8d2863e4ed nw/t1002-cleanup later to maint). diff --git a/git-annotate.html b/git-annotate.html index 69d7c4c7c..054cf1170 100644 --- a/git-annotate.html +++ b/git-annotate.html @@ -749,7 +749,7 @@ git-annotate(1) Manual Page

SYNOPSIS

-
git annotate [<options>] <file> [<revision>]
+
git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>
@@ -1091,7 +1091,7 @@ take effect.

diff --git a/git-annotate.txt b/git-annotate.txt index e44a83133..5ae8aabe0 100644 --- a/git-annotate.txt +++ b/git-annotate.txt @@ -8,7 +8,7 @@ git-annotate - Annotate file lines with commit information SYNOPSIS -------- [verse] -'git annotate' [] [] +'git annotate' [] [] [] [--] DESCRIPTION ----------- diff --git a/git-clean.html b/git-clean.html index 7fdfbdc21..fb95d958d 100644 --- a/git-clean.html +++ b/git-clean.html @@ -749,7 +749,7 @@ git-clean(1) Manual Page

SYNOPSIS

-
git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <path>…
+
git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] [<pathspec>…]
@@ -762,8 +762,8 @@ under version control, starting from the current directory.

Normally, only files unknown to Git are removed, but if the -x option is specified, ignored files are also removed. This can, for example, be useful to remove all build products.

-

If any optional <path>... arguments are given, only those paths -are affected.

+

If any optional <pathspec>... arguments are given, only those paths +that match the pathspec are affected.

@@ -775,10 +775,10 @@ are affected.

- Normally, when no <path> is specified, git clean will not + Normally, when no <pathspec> is specified, git clean will not recurse into untracked directories to avoid removing too much. Specify -d to have it recurse into such directories as well. - If any paths are specified, -d is irrelevant; all untracked + If a <pathspec> is specified, -d is irrelevant; all untracked files matching the specified paths (with exceptions for nested git directories mentioned under --force) will be removed.

@@ -992,7 +992,7 @@ clean.requireForce diff --git a/git-clean.txt b/git-clean.txt index 91742633f..160d08b86 100644 --- a/git-clean.txt +++ b/git-clean.txt @@ -8,7 +8,7 @@ git-clean - Remove untracked files from the working tree SYNOPSIS -------- [verse] -'git clean' [-d] [-f] [-i] [-n] [-q] [-e ] [-x | -X] [--] ... +'git clean' [-d] [-f] [-i] [-n] [-q] [-e ] [-x | -X] [--] [...] DESCRIPTION ----------- @@ -20,16 +20,16 @@ Normally, only files unknown to Git are removed, but if the `-x` option is specified, ignored files are also removed. This can, for example, be useful to remove all build products. -If any optional `...` arguments are given, only those paths -are affected. +If any optional `...` arguments are given, only those paths +that match the pathspec are affected. OPTIONS ------- -d:: - Normally, when no is specified, git clean will not + Normally, when no is specified, git clean will not recurse into untracked directories to avoid removing too much. Specify -d to have it recurse into such directories as well. - If any paths are specified, -d is irrelevant; all untracked + If a is specified, -d is irrelevant; all untracked files matching the specified paths (with exceptions for nested git directories mentioned under `--force`) will be removed. diff --git a/git-commit-graph.html b/git-commit-graph.html index baa3342d2..c7e3188b9 100644 --- a/git-commit-graph.html +++ b/git-commit-graph.html @@ -750,7 +750,10 @@ git-commit-graph(1) Manual Page 
git commit-graph verify [--object-dir <dir>] [--shallow] [--[no-]progress]
-git commit-graph write <options> [--object-dir <dir>] [--[no-]progress]
+git commit-graph write [--object-dir <dir>] [--append] + [--split[=<strategy>]] [--reachable | --stdin-packs | --stdin-commits] + [--changed-paths] [--[no-]max-new-filters <n>] [--[no-]progress] + <split options>
@@ -986,7 +989,7 @@ commitGraph.readChangedPaths diff --git a/git-commit-graph.txt b/git-commit-graph.txt index 36fe56c2c..c8dbceba0 100644 --- a/git-commit-graph.txt +++ b/git-commit-graph.txt @@ -10,7 +10,10 @@ SYNOPSIS -------- [verse] 'git commit-graph verify' [--object-dir ] [--shallow] [--[no-]progress] -'git commit-graph write' [--object-dir ] [--[no-]progress] +'git commit-graph write' [--object-dir ] [--append] + [--split[=]] [--reachable | --stdin-packs | --stdin-commits] + [--changed-paths] [--[no-]max-new-filters ] [--[no-]progress] + DESCRIPTION diff --git a/git-credential-cache--daemon.html b/git-credential-cache--daemon.html index bf88d33bb..0b7a87414 100644 --- a/git-credential-cache--daemon.html +++ b/git-credential-cache--daemon.html @@ -749,7 +749,7 @@ git-credential-cache--daemon(1) Manual Page

SYNOPSIS

-
git credential-cache--daemon [--debug] <socket>
+
git credential-cache--daemon [--debug] <socket-path>
@@ -766,7 +766,7 @@ git-credential-cache--daemon(1) Manual Page started automatically when you use git-credential-cache(1). -

This command listens on the Unix domain socket specified by <socket> +

This command listens on the Unix domain socket specified by <socket-path> for git-credential-cache clients. Clients may store and retrieve credentials. Each credential is held for a timeout specified by the client; once no credentials are held, the daemon exits.

@@ -786,7 +786,7 @@ begun listening for clients.

diff --git a/git-credential-cache--daemon.txt b/git-credential-cache--daemon.txt index 01e1c214d..650a15a7e 100644 --- a/git-credential-cache--daemon.txt +++ b/git-credential-cache--daemon.txt @@ -8,7 +8,7 @@ git-credential-cache--daemon - Temporarily store user credentials in memory SYNOPSIS -------- [verse] -'git credential-cache{litdd}daemon' [--debug] +'git credential-cache{litdd}daemon' [--debug] DESCRIPTION ----------- @@ -16,7 +16,7 @@ DESCRIPTION NOTE: You probably don't want to invoke this command yourself; it is started automatically when you use linkgit:git-credential-cache[1]. -This command listens on the Unix domain socket specified by `` +This command listens on the Unix domain socket specified by `` for `git-credential-cache` clients. Clients may store and retrieve credentials. Each credential is held for a timeout specified by the client; once no credentials are held, the daemon exits. diff --git a/git-diff-files.html b/git-diff-files.html index 40f2f730f..f26773dc2 100644 --- a/git-diff-files.html +++ b/git-diff-files.html @@ -749,7 +749,7 @@ git-diff-files(1) Manual Page

SYNOPSIS

-
git diff-files [-q] [-0|-1|-2|-3|-c|--cc] [<common-diff-options>] [<path>…]
+
git diff-files [-q] [-0 | -1 | -2 | -3 | -c | --cc] [<common-diff-options>] [<path>…]
@@ -2703,7 +2703,7 @@ the pathname, but if that is NUL, the record will show two paths.
Last updated - 2021-12-10 14:52:02 PST + 2022-10-28 11:53:56 PDT
diff --git a/git-diff-files.txt b/git-diff-files.txt index bf1febb9a..591e3801b 100644 --- a/git-diff-files.txt +++ b/git-diff-files.txt @@ -9,7 +9,7 @@ git-diff-files - Compares files in the working tree and the index SYNOPSIS -------- [verse] -'git diff-files' [-q] [-0|-1|-2|-3|-c|--cc] [] [...] +'git diff-files' [-q] [-0 | -1 | -2 | -3 | -c | --cc] [] [...] DESCRIPTION ----------- diff --git a/git-fast-export.html b/git-fast-export.html index 52c2960e7..fa7da2179 100644 --- a/git-fast-export.html +++ b/git-fast-export.html @@ -749,7 +749,7 @@ git-fast-export(1) Manual Page

SYNOPSIS

-
git fast-export [<options>] | git fast-import
+
git fast-export [<options>] | git fast-import
@@ -1120,7 +1120,7 @@ a tag referencing a tree instead of a commit.

diff --git a/git-fast-export.txt b/git-fast-export.txt index 1978dbdc6..4643ddbe6 100644 --- a/git-fast-export.txt +++ b/git-fast-export.txt @@ -9,7 +9,7 @@ git-fast-export - Git data exporter SYNOPSIS -------- [verse] -'git fast-export []' | 'git fast-import' +'git fast-export' [] | 'git fast-import' DESCRIPTION ----------- diff --git a/git-hash-object.html b/git-hash-object.html index 7059476af..40ee5e038 100644 --- a/git-hash-object.html +++ b/git-hash-object.html @@ -749,7 +749,8 @@ git-hash-object(1) Manual Page

SYNOPSIS

-
git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin [--literally]] [--] <file>…
+
git hash-object [-t <type>] [-w] [--path=<file> | --no-filters]
+                [--stdin [--literally]] [--] <file>…
 git hash-object [-t <type>] [-w] --stdin-paths [--no-filters]
@@ -853,7 +854,7 @@ When <type> is not specified, it defaults to "blob".

diff --git a/git-hash-object.txt b/git-hash-object.txt index df9e2c58b..472b5bb99 100644 --- a/git-hash-object.txt +++ b/git-hash-object.txt @@ -9,7 +9,8 @@ git-hash-object - Compute object ID and optionally creates a blob from a file SYNOPSIS -------- [verse] -'git hash-object' [-t ] [-w] [--path=|--no-filters] [--stdin [--literally]] [--] ... +'git hash-object' [-t ] [-w] [--path= | --no-filters] + [--stdin [--literally]] [--] ... 'git hash-object' [-t ] [-w] --stdin-paths [--no-filters] DESCRIPTION diff --git a/git-interpret-trailers.html b/git-interpret-trailers.html index 043c98c31..281a7f0c3 100644 --- a/git-interpret-trailers.html +++ b/git-interpret-trailers.html @@ -749,8 +749,9 @@ git-interpret-trailers(1) Manual Page

SYNOPSIS

-
git interpret-trailers [<options>] [(--trailer <token>[(=|:)<value>])…] [<file>…]
-git interpret-trailers [<options>] [--parse] [<file>…]
+
git interpret-trailers [--in-place] [--trim-empty]
+                        [(--trailer <token>[(=|:)<value>])…]
+                        [--parse] [<file>…]
@@ -1329,7 +1330,7 @@ $ chmod +x .git/hooks/commit-msg diff --git a/git-interpret-trailers.txt b/git-interpret-trailers.txt index 6d6197cd0..22ff3a603 100644 --- a/git-interpret-trailers.txt +++ b/git-interpret-trailers.txt @@ -8,8 +8,9 @@ git-interpret-trailers - Add or parse structured information in commit messages SYNOPSIS -------- [verse] -'git interpret-trailers' [] [(--trailer [(=|:)])...] [...] -'git interpret-trailers' [] [--parse] [...] +'git interpret-trailers' [--in-place] [--trim-empty] + [(--trailer [(=|:)])...] + [--parse] [...] DESCRIPTION ----------- diff --git a/git-merge-base.html b/git-merge-base.html index e15d4ab19..2dd37db5a 100644 --- a/git-merge-base.html +++ b/git-merge-base.html @@ -749,8 +749,8 @@ git-merge-base(1) Manual Page

SYNOPSIS

-
git merge-base [-a|--all] <commit> <commit>…
-git merge-base [-a|--all] --octopus <commit>…
+
git merge-base [-a | --all] <commit> <commit>…
+git merge-base [-a | --all] --octopus <commit>…
 git merge-base --is-ancestor <commit> <commit>
 git merge-base --independent <commit>…
 git merge-base --fork-point <ref> [<commit>]

@@ -1017,7 +1017,7 @@ commits that used to be at the tip of origin/master).
diff --git a/git-merge-base.txt b/git-merge-base.txt index 2d944e085..b01ba3d35 100644 --- a/git-merge-base.txt +++ b/git-merge-base.txt @@ -9,8 +9,8 @@ git-merge-base - Find as good common ancestors as possible for a merge SYNOPSIS -------- [verse] -'git merge-base' [-a|--all] ... -'git merge-base' [-a|--all] --octopus ... +'git merge-base' [-a | --all] ... +'git merge-base' [-a | --all] --octopus ... 'git merge-base' --is-ancestor 'git merge-base' --independent ... 'git merge-base' --fork-point [] diff --git a/git-mv.html b/git-mv.html index 496f7018a..71c0b6755 100644 --- a/git-mv.html +++ b/git-mv.html @@ -749,7 +749,7 @@ git-mv(1) Manual Page

SYNOPSIS

-
git mv <options>… <args>…
+
git mv [<options>] <source>… <destination>
@@ -783,7 +783,7 @@ committed.

- Force renaming or moving of a file even if the target exists + Force renaming or moving of a file even if the <destination> exists.

@@ -857,7 +857,7 @@ been implemented.

diff --git a/git-mv.txt b/git-mv.txt index 79449bf98..fb0220fd1 100644 --- a/git-mv.txt +++ b/git-mv.txt @@ -9,7 +9,7 @@ git-mv - Move or rename a file, a directory, or a symlink SYNOPSIS -------- [verse] -'git mv' ... ... +'git mv' [] ... DESCRIPTION ----------- @@ -30,7 +30,7 @@ OPTIONS ------- -f:: --force:: - Force renaming or moving of a file even if the target exists + Force renaming or moving of a file even if the exists. -k:: Skip move or rename actions which would lead to an error condition. An error happens when a source is neither existing nor diff --git a/git-pack-redundant.html b/git-pack-redundant.html index 837c8a33e..85fe9b035 100644 --- a/git-pack-redundant.html +++ b/git-pack-redundant.html @@ -749,7 +749,7 @@ git-pack-redundant(1) Manual Page

SYNOPSIS

-
git pack-redundant [ --verbose ] [ --alt-odb ] ( --all | <pack-filename>… )
+
git pack-redundant [--verbose] [--alt-odb] (--all | <pack-filename>…)
@@ -819,7 +819,7 @@ git pack-redundant --all | xargs rm

diff --git a/git-pack-redundant.txt b/git-pack-redundant.txt index ee7034b5e..dda80a740 100644 --- a/git-pack-redundant.txt +++ b/git-pack-redundant.txt @@ -9,7 +9,7 @@ git-pack-redundant - Find redundant pack files SYNOPSIS -------- [verse] -'git pack-redundant' [ --verbose ] [ --alt-odb ] ( --all | ... ) +'git pack-redundant' [--verbose] [--alt-odb] (--all | ...) DESCRIPTION ----------- diff --git a/git-prune-packed.html b/git-prune-packed.html index ecaaabe74..cdbe250da 100644 --- a/git-prune-packed.html +++ b/git-prune-packed.html @@ -749,7 +749,7 @@ git-prune-packed(1) Manual Page

SYNOPSIS

-
git prune-packed [-n|--dry-run] [-q|--quiet]
+
git prune-packed [-n | --dry-run] [-q | --quiet]
@@ -814,7 +814,7 @@ disk storage, etc.

diff --git a/git-prune-packed.txt b/git-prune-packed.txt index 9fed59a31..844d6f808 100644 --- a/git-prune-packed.txt +++ b/git-prune-packed.txt @@ -9,7 +9,7 @@ git-prune-packed - Remove extra objects that are already in pack files SYNOPSIS -------- [verse] -'git prune-packed' [-n|--dry-run] [-q|--quiet] +'git prune-packed' [-n | --dry-run] [-q | --quiet] DESCRIPTION diff --git a/git-read-tree.html b/git-read-tree.html index a10c12075..3d0e35d03 100644 --- a/git-read-tree.html +++ b/git-read-tree.html @@ -749,7 +749,7 @@ git-read-tree(1) Manual Page

SYNOPSIS

-
git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>]
+
git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>)
                 [-u | -i]] [--index-output=<file>] [--no-sparse-checkout]
                 (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])

 

@@ -1294,7 +1294,7 @@ support.

 
 
diff --git a/git-read-tree.txt b/git-read-tree.txt
index b9bfdc0a3..7567955ba 100644
--- a/git-read-tree.txt
+++ b/git-read-tree.txt
@@ -9,7 +9,7 @@ git-read-tree - Reads tree information into the index
 SYNOPSIS
 --------
 [verse]
-'git read-tree' [[-m [--trivial] [--aggressive] | --reset | --prefix=]
+'git read-tree' [(-m [--trivial] [--aggressive] | --reset | --prefix=)
 		[-u | -i]] [--index-output=] [--no-sparse-checkout]
 		(--empty |  [ []])
 
diff --git a/git-receive-pack.html b/git-receive-pack.html
index 389f6c89b..dbdb992c9 100644
--- a/git-receive-pack.html
+++ b/git-receive-pack.html
@@ -749,7 +749,7 @@ git-receive-pack(1) Manual Page
 
SYNOPSIS

 

 

-
git-receive-pack <directory>

+
git receive-pack <git-dir>

 

 

 

@@ -781,7 +781,7 @@ its behavior, see git-config(1).
-<directory> +<git-dir>

@@ -1094,7 +1094,7 @@ The pre-receive hook MUST NOT update any refs to point to

diff --git a/git-receive-pack.txt b/git-receive-pack.txt index 014a78409..65ff518cc 100644 --- a/git-receive-pack.txt +++ b/git-receive-pack.txt @@ -9,7 +9,7 @@ git-receive-pack - Receive what is pushed into the repository SYNOPSIS -------- [verse] -'git-receive-pack' +'git receive-pack' DESCRIPTION ----------- @@ -38,7 +38,7 @@ its behavior, see linkgit:git-config[1]. OPTIONS ------- -:: +:: The repository to sync into. --http-backend-info-refs:: diff --git a/git-reflog.html b/git-reflog.html index 0fc7d29fe..a6265b239 100644 --- a/git-reflog.html +++ b/git-reflog.html @@ -749,18 +749,7 @@ git-reflog(1) Manual Page

SYNOPSIS

-
git reflog <subcommand> <options>
-
-
-
-
-
-

DESCRIPTION

-
-

The command takes various subcommands, and different options -depending on the subcommand:

-
-
git reflog [show] [<log-options>] [<ref>]
+
git reflog [show] [<log-options>] [<ref>]
 git reflog expire [--expire=<time>] [--expire-unreachable=<time>]
         [--rewrite] [--updateref] [--stale-fix]
         [--dry-run | -n] [--verbose] [--all [--single-worktree] | <refs>…]
@@ -769,6 +758,12 @@ depending on the subcommand:
git reflog exists <ref>
+
+
+
+

DESCRIPTION

+
+

This command manages the information recorded in the reflogs.

Reference logs, or "reflogs", record when the tips of branches and other references were updated in the local repository. Reflogs are useful in various Git commands, to specify the old value of a @@ -776,7 +771,8 @@ reference. For example, HEAD@{2} means "where HEAD used to be two moves ago", master@{one.week.ago} means "where master used to point to one week ago in this local repository", and so on. See gitrevisions(7) for more details.

-

This command manages the information recorded in the reflogs.

+

The command takes various subcommands, and different options +depending on the subcommand:

The "show" subcommand (which is also the default, in the absence of any subcommands) shows the log of the reference provided in the command-line (or HEAD, by default). The reflog covers all recent @@ -929,7 +925,7 @@ used with expire.

diff --git a/git-reflog.txt b/git-reflog.txt index db9d46edf..ec64cbff4 100644 --- a/git-reflog.txt +++ b/git-reflog.txt @@ -9,15 +9,7 @@ git-reflog - Manage reflog information SYNOPSIS -------- [verse] -'git reflog' - -DESCRIPTION ------------ -The command takes various subcommands, and different options -depending on the subcommand: - -[verse] -'git reflog' ['show'] [] [] +'git reflog' [show] [] [] 'git reflog expire' [--expire=
diff --git a/git-rerere.txt b/git-rerere.txt index 4cfc88337..992b46927 100644 --- a/git-rerere.txt +++ b/git-rerere.txt @@ -8,7 +8,7 @@ git-rerere - Reuse recorded resolution of conflicted merges SYNOPSIS -------- [verse] -'git rerere' ['clear'|'forget' |'diff'|'remaining'|'status'|'gc'] +'git rerere' [clear | forget ... | diff | status | remaining | gc] DESCRIPTION ----------- diff --git a/git-rev-list.html b/git-rev-list.html index ab8cc4c1a..810ef12e3 100644 --- a/git-rev-list.html +++ b/git-rev-list.html @@ -749,7 +749,7 @@ git-rev-list(1) Manual Page

SYNOPSIS

-
git rev-list [<options>] <commit>… [[--] <path>…]
+
git rev-list [<options>] <commit>… [--] [<path>…]
@@ -3706,7 +3706,7 @@ Compare the on-disk size of branches in one group of refs, excluding diff --git a/git-rev-list.txt b/git-rev-list.txt index 20bb8e821..51029a227 100644 --- a/git-rev-list.txt +++ b/git-rev-list.txt @@ -9,7 +9,7 @@ git-rev-list - Lists commit objects in reverse chronological order SYNOPSIS -------- [verse] -'git rev-list' [] ... [[--] ...] +'git rev-list' [] ... [--] [...] DESCRIPTION ----------- diff --git a/git-send-pack.html b/git-send-pack.html index 774088af4..c4354c91c 100644 --- a/git-send-pack.html +++ b/git-send-pack.html @@ -749,9 +749,10 @@ git-send-pack(1) Manual Page

SYNOPSIS

-
git send-pack [--dry-run] [--force] [--receive-pack=<git-receive-pack>]
+
git send-pack [--mirror] [--dry-run] [--force]
+                [--receive-pack=<git-receive-pack>]
                 [--verbose] [--thin] [--atomic]
-                [--[no-]signed|--signed=(true|false|if-asked)]
+                [--[no-]signed | --signed=(true|false|if-asked)]
                 [<host>:]<directory> (--all | <ref>…)
@@ -993,7 +994,7 @@ to disable the fast-forward check only on that ref.

diff --git a/git-send-pack.txt b/git-send-pack.txt index be41f1197..595b00215 100644 --- a/git-send-pack.txt +++ b/git-send-pack.txt @@ -9,9 +9,10 @@ git-send-pack - Push objects over Git protocol to another repository SYNOPSIS -------- [verse] -'git send-pack' [--dry-run] [--force] [--receive-pack=] +'git send-pack' [--mirror] [--dry-run] [--force] + [--receive-pack=] [--verbose] [--thin] [--atomic] - [--[no-]signed|--signed=(true|false|if-asked)] + [--[no-]signed | --signed=(true|false|if-asked)] [:] (--all | ...) DESCRIPTION diff --git a/git-show-branch.html b/git-show-branch.html index 83a3312dc..c1a467504 100644 --- a/git-show-branch.html +++ b/git-show-branch.html @@ -749,12 +749,12 @@ git-show-branch(1) Manual Page

SYNOPSIS

-
git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]
+
git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]
                 [--current] [--color[=<when>] | --no-color] [--sparse]
                 [--more=<n> | --list | --independent | --merge-base]
                 [--no-name | --sha1-name] [--topics]
                 [(<rev> | <glob>)…]
-git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]

+git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]
@@ -1066,7 +1066,7 @@ showBranch.default diff --git a/git-show-branch.txt b/git-show-branch.txt index e5ec6b467..71f608b1f 100644 --- a/git-show-branch.txt +++ b/git-show-branch.txt @@ -8,12 +8,12 @@ git-show-branch - Show branches and their commits SYNOPSIS -------- [verse] -'git show-branch' [-a|--all] [-r|--remotes] [--topo-order | --date-order] +'git show-branch' [-a | --all] [-r | --remotes] [--topo-order | --date-order] [--current] [--color[=] | --no-color] [--sparse] [--more= | --list | --independent | --merge-base] [--no-name | --sha1-name] [--topics] [( | )...] -'git show-branch' (-g|--reflog)[=[,]] [--list] [] +'git show-branch' (-g | --reflog)[=[,]] [--list] [] DESCRIPTION ----------- diff --git a/git-show-ref.html b/git-show-ref.html index d4672d39f..4fbb3d42a 100644 --- a/git-show-ref.html +++ b/git-show-ref.html @@ -749,8 +749,8 @@ git-show-ref(1) Manual Page

SYNOPSIS

-
git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference]
-             [-s|--hash[=<n>]] [--abbrev[=<n>]] [--tags]
+
git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference]
+             [-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags]
              [--heads] [--] [<pattern>…]
 git show-ref --exclude-existing[=<pattern>]

 

@@ -977,7 +977,7 @@ flag, so you can do

 
 
diff --git a/git-show-ref.txt b/git-show-ref.txt
index ab4d27192..d1d56f68b 100644
--- a/git-show-ref.txt
+++ b/git-show-ref.txt
@@ -8,8 +8,8 @@ git-show-ref - List references in a local repository
 SYNOPSIS
 --------
 [verse]
-'git show-ref' [-q|--quiet] [--verify] [--head] [-d|--dereference]
-	     [-s|--hash[=]] [--abbrev[=]] [--tags]
+'git show-ref' [-q | --quiet] [--verify] [--head] [-d | --dereference]
+	     [-s | --hash[=]] [--abbrev[=]] [--tags]
 	     [--heads] [--] [...]
 'git show-ref' --exclude-existing[=]
 
diff --git a/git-sparse-checkout.html b/git-sparse-checkout.html
index 2972fc11f..b89b100cf 100644
--- a/git-sparse-checkout.html
+++ b/git-sparse-checkout.html
@@ -749,7 +749,7 @@ git-sparse-checkout(1) Manual Page
 
SYNOPSIS

 

 

-
git sparse-checkout <subcommand> [<options>]

+
git sparse-checkout (init | list | set | add | reapply | disable) [<options>]

 

 

 

@@ -1289,7 +1289,7 @@ of these restrictions.
diff --git a/git-sparse-checkout.txt b/git-sparse-checkout.txt index 3776705bf..68392d2a5 100644 --- a/git-sparse-checkout.txt +++ b/git-sparse-checkout.txt @@ -9,7 +9,7 @@ git-sparse-checkout - Reduce your working tree to a subset of tracked files SYNOPSIS -------- [verse] -'git sparse-checkout []' +'git sparse-checkout' (init | list | set | add | reapply | disable) [] DESCRIPTION diff --git a/git-stash.html b/git-stash.html index 5a2eb3527..dddd48949 100644 --- a/git-stash.html +++ b/git-stash.html @@ -750,17 +750,20 @@ git-stash(1) Manual Page 
git stash list [<log-options>]
-git stash show [-u|--include-untracked|--only-untracked] [<diff-options>] [<stash>]
-git stash drop [-q|--quiet] [<stash>]
-git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]
+git stash show [-u | --include-untracked | --only-untracked] [<diff-options>] [<stash>]
+git stash drop [-q | --quiet] [<stash>]
+git stash pop [--index] [-q | --quiet] [<stash>]
+git stash apply [--index] [-q | --quiet] [<stash>]
 git stash branch <branchname> [<stash>]
-git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--quiet]
-             [-u|--include-untracked] [-a|--all] [-m|--message <message>]
+git stash [push [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q | --quiet]
+             [-u | --include-untracked] [-a | --all] [(-m | --message) <message>]
              [--pathspec-from-file=<file> [--pathspec-file-nul]]
              [--] [<pathspec>…]]
+git stash save [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q | --quiet]
+             [-u | --include-untracked] [-a | --all] [<message>]
 git stash clear
 git stash create [<message>]
-git stash store [-m|--message <message>] [-q|--quiet] <commit>
+git stash store [(-m | --message) <message>] [-q | --quiet] <commit>
@@ -792,7 +795,7 @@ stash index (e.g. the integer n is equivalent to stash@{n}
-push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [-m|--message <message>] [--pathspec-from-file=<file> [--pathspec-file-nul]] [--] [<pathspec>…] +push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [(-m|--message) <message>] [--pathspec-from-file=<file> [--pathspec-file-nul]] [--] [<pathspec>…]

@@ -1324,7 +1327,7 @@ stash.showStat

diff --git a/git-stash.txt b/git-stash.txt index c5d709182..f4bb6114d 100644 --- a/git-stash.txt +++ b/git-stash.txt @@ -9,17 +9,20 @@ SYNOPSIS -------- [verse] 'git stash' list [] -'git stash' show [-u|--include-untracked|--only-untracked] [] [] -'git stash' drop [-q|--quiet] [] -'git stash' ( pop | apply ) [--index] [-q|--quiet] [] +'git stash' show [-u | --include-untracked | --only-untracked] [] [] +'git stash' drop [-q | --quiet] [] +'git stash' pop [--index] [-q | --quiet] [] +'git stash' apply [--index] [-q | --quiet] [] 'git stash' branch [] -'git stash' [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--quiet] - [-u|--include-untracked] [-a|--all] [-m|--message ] +'git stash' [push [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q | --quiet] + [-u | --include-untracked] [-a | --all] [(-m | --message) ] [--pathspec-from-file= [--pathspec-file-nul]] [--] [...]] +'git stash' save [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q | --quiet] + [-u | --include-untracked] [-a | --all] [] 'git stash' clear 'git stash' create [] -'git stash' store [-m|--message ] [-q|--quiet] +'git stash' store [(-m | --message) ] [-q | --quiet] DESCRIPTION ----------- @@ -47,7 +50,7 @@ stash index (e.g. the integer `n` is equivalent to `stash@{n}`). COMMANDS -------- -push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [-m|--message ] [--pathspec-from-file= [--pathspec-file-nul]] [--] [...]:: +push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [(-m|--message) ] [--pathspec-from-file= [--pathspec-file-nul]] [--] [...]:: Save your local modifications to a new 'stash entry' and roll them back to HEAD (in the working tree and in the index). diff --git a/git-status.html b/git-status.html index b942b53c0..ec064b9ee 100644 --- a/git-status.html +++ b/git-status.html @@ -749,7 +749,7 @@ git-status(1) Manual Page

SYNOPSIS

-
git status [<options>…] [--] [<pathspec>…]
+
git status [<options>] [--] [<pathspec>…]
@@ -1377,7 +1377,7 @@ using git --no-optional-locks status (see git(1) diff --git a/git-status.txt b/git-status.txt index 54a4b29b4..5e438a7fd 100644 --- a/git-status.txt +++ b/git-status.txt @@ -9,7 +9,7 @@ git-status - Show the working tree status SYNOPSIS -------- [verse] -'git status' [...] [--] [...] +'git status' [] [--] [...] DESCRIPTION ----------- diff --git a/git-tag.html b/git-tag.html index 521139cc4..a85796d26 100644 --- a/git-tag.html +++ b/git-tag.html @@ -749,7 +749,7 @@ git-tag(1) Manual Page

SYNOPSIS

-
git tag [-a | -s | -u <keyid>] [-f] [-m <msg> | -F <file>] [-e]
+
git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]
         <tagname> [<commit> | <object>]
 git tag -d <tagname>…
 git tag [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]
@@ -767,16 +767,16 @@ git-tag(1) Manual Page
 
Add a tag reference in refs/tags/, unless -d/-l/-v is given
 to delete, list or verify tags.

 
Unless -f is given, the named tag must not yet exist.

-
If one of -a, -s, or -u <keyid> is passed, the command
+
If one of -a, -s, or -u <key-id> is passed, the command
 creates a tag object, and requires a tag message.  Unless
 -m <msg> or -F <file> is given, an editor is started for the user to type
 in the tag message.

-
If -m <msg> or -F <file> is given and -a, -s, and -u <keyid>
+
If -m <msg> or -F <file> is given and -a, -s, and -u <key-id>
 are absent, -a is implied.

 
Otherwise, a tag reference that points directly at the given object
 (i.e., a lightweight tag) is created.

 
A GnuPG signed tag object will be created when -s or -u
-<keyid> is used.  When -u <keyid> is not used, the
+<key-id> is used.  When -u <key-id> is not used, the
 committer identity for the current user is used to find the
 GnuPG key for signing.  The configuration variable gpg.program
 is used to specify custom GnuPG binary.

@@ -830,10 +830,10 @@ lightweight tags by default.
--u <keyid> +-u <key-id>
---local-user=<keyid> +--local-user=<key-id>

@@ -1012,7 +1012,7 @@ options for details.

Use the given tag message (instead of prompting). If multiple -m options are given, their values are concatenated as separate paragraphs. - Implies -a if none of -a, -s, or -u <keyid> + Implies -a if none of -a, -s, or -u <key-id> is given.

@@ -1026,7 +1026,7 @@ options for details.

Take the tag message from the given file. Use - to read the message from the standard input. - Implies -a if none of -a, -s, or -u <keyid> + Implies -a if none of -a, -s, or -u <key-id> is given.

@@ -1114,7 +1114,7 @@ it in the repository configuration as follows:

[user]
-    signingKey = <gpg-keyid>
+ signingKey = <gpg-key_id>

pager.tag is only respected when listing tags, i.e., when -l is used or implied. The default is to use a pager. @@ -1339,7 +1339,7 @@ commits and from none of the --no-merged commits are shown.

Last updated - 2021-02-26 23:35:19 PST + 2022-10-28 11:53:56 PDT
diff --git a/git-tag.txt b/git-tag.txt index 31a97a1b6..fdc72b587 100644 --- a/git-tag.txt +++ b/git-tag.txt @@ -9,7 +9,7 @@ git-tag - Create, list, delete or verify a tag object signed with GPG SYNOPSIS -------- [verse] -'git tag' [-a | -s | -u ] [-f] [-m | -F ] [-e] +'git tag' [-a | -s | -u ] [-f] [-m | -F ] [-e] [ | ] 'git tag' -d ... 'git tag' [-n[]] -l [--contains ] [--no-contains ] @@ -26,19 +26,19 @@ to delete, list or verify tags. Unless `-f` is given, the named tag must not yet exist. -If one of `-a`, `-s`, or `-u ` is passed, the command +If one of `-a`, `-s`, or `-u ` is passed, the command creates a 'tag' object, and requires a tag message. Unless `-m ` or `-F ` is given, an editor is started for the user to type in the tag message. -If `-m ` or `-F ` is given and `-a`, `-s`, and `-u ` +If `-m ` or `-F ` is given and `-a`, `-s`, and `-u ` are absent, `-a` is implied. Otherwise, a tag reference that points directly at the given object (i.e., a lightweight tag) is created. A GnuPG signed tag object will be created when `-s` or `-u -` is used. When `-u ` is not used, the +` is used. When `-u ` is not used, the committer identity for the current user is used to find the GnuPG key for signing. The configuration variable `gpg.program` is used to specify custom GnuPG binary. @@ -72,8 +72,8 @@ OPTIONS Override `tag.gpgSign` configuration variable that is set to force each and every tag to be signed. --u :: ---local-user=:: +-u :: +--local-user=:: Make a GPG-signed tag, using the given key. -f:: @@ -164,14 +164,14 @@ This option is only applicable when listing tags without annotation lines. Use the given tag message (instead of prompting). If multiple `-m` options are given, their values are concatenated as separate paragraphs. - Implies `-a` if none of `-a`, `-s`, or `-u ` + Implies `-a` if none of `-a`, `-s`, or `-u ` is given. -F :: --file=:: Take the tag message from the given file. Use '-' to read the message from the standard input. - Implies `-a` if none of `-a`, `-s`, or `-u ` + Implies `-a` if none of `-a`, `-s`, or `-u ` is given. -e:: @@ -220,7 +220,7 @@ it in the repository configuration as follows: ------------------------------------- [user] - signingKey = + signingKey = ------------------------------------- `pager.tag` is only respected when listing tags, i.e., when `-l` is diff --git a/git-update-server-info.html b/git-update-server-info.html index f14fb5edc..681a5082f 100644 --- a/git-update-server-info.html +++ b/git-update-server-info.html @@ -749,7 +749,7 @@ git-update-server-info(1) Manual Page

SYNOPSIS

-
git update-server-info
+
git update-server-info [-f | --force]
@@ -765,6 +765,24 @@ generates such auxiliary files.

+

OPTIONS

+
+
+
+-f +
+
+--force +
+
+

+ update the info files from scratch. +

+
+
+
+
+

OUTPUT

Currently the command updates the following files. Please see @@ -795,7 +813,7 @@ info/refs

diff --git a/git-update-server-info.txt b/git-update-server-info.txt index 969bb2e15..17e429dbd 100644 --- a/git-update-server-info.txt +++ b/git-update-server-info.txt @@ -9,7 +9,7 @@ git-update-server-info - Update auxiliary info file to help dumb servers SYNOPSIS -------- [verse] -'git update-server-info' +'git update-server-info' [-f | --force] DESCRIPTION ----------- @@ -19,6 +19,12 @@ $GIT_OBJECT_DIRECTORY/info directories to help clients discover what references and packs the server has. This command generates such auxiliary files. +OPTIONS +------- +-f:: +--force:: + update the info files from scratch. + OUTPUT ------ diff --git a/git-upload-archive.html b/git-upload-archive.html index b2484b48a..c60273b05 100644 --- a/git-upload-archive.html +++ b/git-upload-archive.html @@ -749,7 +749,7 @@ git-upload-archive(1) Manual Page

SYNOPSIS

-
git upload-archive <directory>
+
git upload-archive <repository>
@@ -811,7 +811,7 @@ access via non-smart-http.

-<directory> +<repository>

@@ -832,7 +832,7 @@ access via non-smart-http.

diff --git a/git-upload-archive.txt b/git-upload-archive.txt index fba0f1c1b..e8eb10baa 100644 --- a/git-upload-archive.txt +++ b/git-upload-archive.txt @@ -9,7 +9,7 @@ git-upload-archive - Send archive back to git-archive SYNOPSIS -------- [verse] -'git upload-archive' +'git upload-archive' DESCRIPTION ----------- @@ -54,7 +54,7 @@ access via non-smart-http. OPTIONS ------- -:: +:: The repository to get a tar archive from. GIT diff --git a/git-var.html b/git-var.html index 42f321fa4..d0d0b3a88 100644 --- a/git-var.html +++ b/git-var.html @@ -749,7 +749,7 @@ git-var(1) Manual Page

SYNOPSIS

-
git var ( -l | <variable> )
+
git var (-l | <variable>)
@@ -864,7 +864,7 @@ GIT_DEFAULT_BRANCH diff --git a/git-var.txt b/git-var.txt index 387cc1b91..6aa521fab 100644 --- a/git-var.txt +++ b/git-var.txt @@ -9,7 +9,7 @@ git-var - Show a Git logical variable SYNOPSIS -------- [verse] -'git var' ( -l | ) +'git var' (-l | ) DESCRIPTION ----------- diff --git a/git-verify-commit.html b/git-verify-commit.html index 1e30c690f..5d96af43f 100644 --- a/git-verify-commit.html +++ b/git-verify-commit.html @@ -749,7 +749,7 @@ git-verify-commit(1) Manual Page

SYNOPSIS

-
git verify-commit <commit>…
+
git verify-commit [-v | --verbose] [--raw] <commit>…
@@ -806,7 +806,7 @@ git-verify-commit(1) Manual Page diff --git a/git-verify-commit.txt b/git-verify-commit.txt index 92097f667..aee4c40ea 100644 --- a/git-verify-commit.txt +++ b/git-verify-commit.txt @@ -8,7 +8,7 @@ git-verify-commit - Check the GPG signature of commits SYNOPSIS -------- [verse] -'git verify-commit' ... +'git verify-commit' [-v | --verbose] [--raw] ... DESCRIPTION ----------- diff --git a/git-verify-pack.html b/git-verify-pack.html index fedd8bf04..3b18d241e 100644 --- a/git-verify-pack.html +++ b/git-verify-pack.html @@ -749,7 +749,7 @@ git-verify-pack(1) Manual Page

SYNOPSIS

-
git verify-pack [-v|--verbose] [-s|--stat-only] [--] <pack>.idx …
+
git verify-pack [-v | --verbose] [-s | --stat-only] [--] <pack>.idx…
@@ -836,7 +836,7 @@ corresponding pack file.

diff --git a/git-verify-pack.txt b/git-verify-pack.txt index 61ca6d04c..b8720dce8 100644 --- a/git-verify-pack.txt +++ b/git-verify-pack.txt @@ -9,7 +9,7 @@ git-verify-pack - Validate packed Git archive files SYNOPSIS -------- [verse] -'git verify-pack' [-v|--verbose] [-s|--stat-only] [--] .idx ... +'git verify-pack' [-v | --verbose] [-s | --stat-only] [--] .idx... DESCRIPTION diff --git a/git-verify-tag.html b/git-verify-tag.html index fa7c84c9a..3e1786e1c 100644 --- a/git-verify-tag.html +++ b/git-verify-tag.html @@ -749,7 +749,7 @@ git-verify-tag(1) Manual Page

SYNOPSIS

-
git verify-tag [--format=<format>] <tag>…
+
git verify-tag [-v | --verbose] [--format=<format>] [--raw] <tag>…
@@ -806,7 +806,7 @@ git-verify-tag(1) Manual Page diff --git a/git-verify-tag.txt b/git-verify-tag.txt index 0b8075dad..81d50ecc4 100644 --- a/git-verify-tag.txt +++ b/git-verify-tag.txt @@ -8,7 +8,7 @@ git-verify-tag - Check the GPG signature of tags SYNOPSIS -------- [verse] -'git verify-tag' [--format=] ... +'git verify-tag' [-v | --verbose] [--format=] [--raw] ... DESCRIPTION ----------- diff --git a/git-worktree.html b/git-worktree.html index 6be678196..665388379 100644 --- a/git-worktree.html +++ b/git-worktree.html @@ -749,7 +749,8 @@ git-worktree(1) Manual Page

SYNOPSIS

-
git worktree add [-f] [--detach] [--checkout] [--lock [--reason <string>]] [-b <new-branch>] <path> [<commit-ish>]
+
git worktree add [-f] [--detach] [--checkout] [--lock [--reason <string>]]
+                   [-b <new-branch>] <path> [<commit-ish>]
 git worktree list [-v | --porcelain [-z]]
 git worktree lock [--reason <string>] <worktree>
 git worktree move <worktree> <new-path>
@@ -1379,7 +1380,7 @@ checkouts of a superproject.
diff --git a/git-worktree.txt b/git-worktree.txt index ada30c86a..063d6eeb9 100644 --- a/git-worktree.txt +++ b/git-worktree.txt @@ -9,7 +9,8 @@ git-worktree - Manage multiple working trees SYNOPSIS -------- [verse] -'git worktree add' [-f] [--detach] [--checkout] [--lock [--reason ]] [-b ] [] +'git worktree add' [-f] [--detach] [--checkout] [--lock [--reason ]] + [-b ] [] 'git worktree list' [-v | --porcelain [-z]] 'git worktree lock' [--reason ] 'git worktree move' diff --git a/howto/coordinate-embargoed-releases.html b/howto/coordinate-embargoed-releases.html index 3505138eb..de337a88e 100644 --- a/howto/coordinate-embargoed-releases.html +++ b/howto/coordinate-embargoed-releases.html @@ -873,7 +873,7 @@ Thanks, diff --git a/howto/keep-canonical-history-correct.html b/howto/keep-canonical-history-correct.html index a8faba141..6fb739a93 100644 --- a/howto/keep-canonical-history-correct.html +++ b/howto/keep-canonical-history-correct.html @@ -938,7 +938,7 @@ tip of your master again and redo the two merges:

diff --git a/howto/maintain-git.html b/howto/maintain-git.html index 9c5c56d39..b011ca141 100644 --- a/howto/maintain-git.html +++ b/howto/maintain-git.html @@ -1469,7 +1469,7 @@ $ git update-ref -d $mf/ai/topic diff --git a/howto/new-command.html b/howto/new-command.html index 5a7417a30..5cdbdcfa9 100644 --- a/howto/new-command.html +++ b/howto/new-command.html @@ -863,7 +863,7 @@ letter [PATCH 0/n]. diff --git a/howto/rebase-from-internal-branch.html b/howto/rebase-from-internal-branch.html index 6148ea7ba..8fbf3940c 100644 --- a/howto/rebase-from-internal-branch.html +++ b/howto/rebase-from-internal-branch.html @@ -895,7 +895,7 @@ the #1' commit.

diff --git a/howto/rebuild-from-update-hook.html b/howto/rebuild-from-update-hook.html index de351935c..1f1a4abc2 100644 --- a/howto/rebuild-from-update-hook.html +++ b/howto/rebuild-from-update-hook.html @@ -847,7 +847,7 @@ This is still crude and does not protect against simultaneous diff --git a/howto/recover-corrupted-blob-object.html b/howto/recover-corrupted-blob-object.html index 983f2b35e..fc7c46824 100644 --- a/howto/recover-corrupted-blob-object.html +++ b/howto/recover-corrupted-blob-object.html @@ -880,7 +880,7 @@ thing.

diff --git a/howto/recover-corrupted-object-harder.html b/howto/recover-corrupted-object-harder.html index 4cceb5119..ffec0c27b 100644 --- a/howto/recover-corrupted-object-harder.html +++ b/howto/recover-corrupted-object-harder.html @@ -1189,7 +1189,7 @@ int main(int argc, char **argv) diff --git a/howto/revert-a-faulty-merge.html b/howto/revert-a-faulty-merge.html index e9908b883..241bde349 100644 --- a/howto/revert-a-faulty-merge.html +++ b/howto/revert-a-faulty-merge.html @@ -1025,7 +1025,7 @@ P---o---o---M---x---x---W---x---M2 diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html index 0f5dbf4ad..3d2f84c92 100644 --- a/howto/revert-branch-rebase.html +++ b/howto/revert-branch-rebase.html @@ -907,7 +907,7 @@ Committed merge 7fb9b7262a1d1e0a47bbfdcbbcf50ce0635d3f8f diff --git a/howto/separating-topic-branches.html b/howto/separating-topic-branches.html index 7f95f32d9..eb804a6e4 100644 --- a/howto/separating-topic-branches.html +++ b/howto/separating-topic-branches.html @@ -841,7 +841,7 @@ o---o"master" diff --git a/howto/setup-git-server-over-http.html b/howto/setup-git-server-over-http.html index 006970b7a..89c719b09 100644 --- a/howto/setup-git-server-over-http.html +++ b/howto/setup-git-server-over-http.html @@ -1071,7 +1071,7 @@ help diagnosing the problem, but removes security checks.

diff --git a/howto/update-hook-example.html b/howto/update-hook-example.html index 22522d315..f9432a11e 100644 --- a/howto/update-hook-example.html +++ b/howto/update-hook-example.html @@ -930,7 +930,7 @@ that JC can make non-fast-forward pushes on it.

diff --git a/howto/use-git-daemon.html b/howto/use-git-daemon.html index 0b170bc29..0c116af3c 100644 --- a/howto/use-git-daemon.html +++ b/howto/use-git-daemon.html @@ -791,7 +791,7 @@ a good practice to put the paths after a "--" separator.

diff --git a/howto/using-merge-subtree.html b/howto/using-merge-subtree.html index acf6a03bc..1a3acb05f 100644 --- a/howto/using-merge-subtree.html +++ b/howto/using-merge-subtree.html @@ -848,7 +848,7 @@ Please note that if the other project merges from you, then it will diff --git a/howto/using-signed-tag-in-pull-request.html b/howto/using-signed-tag-in-pull-request.html index 112ab7a83..9d0791156 100644 --- a/howto/using-signed-tag-in-pull-request.html +++ b/howto/using-signed-tag-in-pull-request.html @@ -952,7 +952,7 @@ as part of the merge commit.

-- cgit 1.2.3-korg