diff --git a/DecisionMaking.html b/DecisionMaking.html index dc74c5765..9d7ba783c 100644 --- a/DecisionMaking.html +++ b/DecisionMaking.html @@ -538,7 +538,7 @@

Other Discussion Venues

diff --git a/MyFirstContribution.html b/MyFirstContribution.html index d7143d2c2..c95bae8b0 100644 --- a/MyFirstContribution.html +++ b/MyFirstContribution.html @@ -2256,7 +2256,7 @@

After Revie diff --git a/RelNotes/2.51.0.adoc b/RelNotes/2.51.0.adoc index 78b491853..a89d459d2 100644 --- a/RelNotes/2.51.0.adoc +++ b/RelNotes/2.51.0.adoc @@ -64,6 +64,9 @@ UI, Workflows & Features * "git for-each-ref" learns "--start-after" option to help applications that want to page its output. + * "git switch" and "git restore" are declared to be no longer + experimental. + Performance, Internal Implementation, Development Support etc. -------------------------------------------------------------- @@ -269,6 +272,18 @@ including security updates, are included in this release. few test helper programs are now closed. (merge 0f1b33815b hl/test-helper-fd-close later to maint). + * Interactive prompt code did not correctly strip CRLF from the end + of line on Windows. + (merge 711a20827b js/prompt-crlf-fix later to maint). + + * The config API had a set of convenience wrapper functions that + implicitly use the_repository instance; they have been removed and + inlined at the calling sites. + + * "git add/etc -p" now honor the diff.context configuration variable, + and also they learn to honor the -U command-line option. + (merge 2b3ae04011 lm/add-p-context later to maint). + * Other code cleanup, docfix, build fix, etc. (merge b257adb571 lo/my-first-ow-doc-update later to maint). (merge 8b34b6a220 ly/sequencer-update-squash-is-fixup-only later to maint). @@ -299,3 +314,9 @@ including security updates, are included in this release. (merge 26552cb62a jk/unleak-reflog-expire-entry later to maint). (merge 339d95fda9 jc/ci-print-test-failures-fix later to maint). (merge 8c3add51a8 cb/meson-avoid-broken-macos-pcre2 later to maint). + (merge 5247da07b8 ps/meson-clar-decls-fix later to maint). + (merge f3ef347bb2 ch/t7450-recursive-clone-test-fix later to maint). + (merge 4ac3302a1a jc/doc-release-vs-clear later to maint). + (merge 3bdd897413 ms/meson-with-ancient-git-wo-ls-files-dedup later to maint). + (merge cca758d324 kh/doc-fast-import-historical later to maint). + (merge 9b0781196a jc/test-hashmap-is-still-here later to maint). diff --git a/ReviewingGuidelines.html b/ReviewingGuidelines.html index cad5c1c8d..7630cae83 100644 --- a/ReviewingGuidelines.html +++ b/ReviewingGuidelines.html @@ -683,7 +683,7 @@

See Also

diff --git a/SubmittingPatches.html b/SubmittingPatches.html index 75101d5e3..3f1a7b151 100644 --- a/SubmittingPatches.html +++ b/SubmittingPatches.html @@ -1592,7 +1592,7 @@

Gnus

diff --git a/ToolsForGit.html b/ToolsForGit.html index 7e2f78bb0..33cdfa64f 100644 --- a/ToolsForGit.html +++ b/ToolsForGit.html @@ -520,7 +520,7 @@

-Last updated 2025-03-26 00:41:02 -0700 +Last updated 2025-06-20 18:10:42 -0700
diff --git a/diff-context-options.adoc b/diff-context-options.adoc new file mode 100644 index 000000000..e16126035 --- /dev/null +++ b/diff-context-options.adoc @@ -0,0 +1,10 @@ +`-U`:: +`--unified=`:: + Generate diffs with __ lines of context. Defaults to `diff.context` + or 3 if the config option is unset. + +`--inter-hunk-context=`:: + Show the context between diff hunks, up to the specified __ + of lines, thereby fusing hunks that are close to each other. + Defaults to `diff.interHunkContext` or 0 if the config option + is unset. diff --git a/everyday.html b/everyday.html index dfe3e9b42..ccd0a7244 100644 --- a/everyday.html +++ b/everyday.html @@ -457,7 +457,7 @@

Everyday Git With 20 Commands Or So

diff --git a/git-add.adoc b/git-add.adoc index eba0b419c..b7a735824 100644 --- a/git-add.adoc +++ b/git-add.adoc @@ -104,6 +104,8 @@ This effectively runs `add --interactive`, but bypasses the initial command menu and directly jumps to the `patch` subcommand. See ``Interactive mode'' for details. +include::diff-context-options.adoc[] + `-e`:: `--edit`:: Open the diff vs. the index in an editor and let the user diff --git a/git-add.html b/git-add.html index d4906c880..9f10d7925 100644 --- a/git-add.html +++ b/git-add.html @@ -570,6 +570,19 @@

OPTIONS

See “Interactive mode” for details.

+
-U<n>
+
--unified=<n>
+
+

Generate diffs with <n> lines of context. Defaults to diff.context +or 3 if the config option is unset.

+
+
--inter-hunk-context=<n>
+
+

Show the context between diff hunks, up to the specified <number> +of lines, thereby fusing hunks that are close to each other. +Defaults to diff.interHunkContext or 0 if the config option +is unset.

+
-e
--edit
@@ -1030,7 +1043,7 @@

GIT

diff --git a/git-am.html b/git-am.html index 5928b0ea7..909c1dc4e 100644 --- a/git-am.html +++ b/git-am.html @@ -869,7 +869,7 @@

GIT

diff --git a/git-archimport.html b/git-archimport.html index 12efcb02c..ad6ab635c 100644 --- a/git-archimport.html +++ b/git-archimport.html @@ -591,7 +591,7 @@

GIT

diff --git a/git-archive.html b/git-archive.html index 1161bbf05..5873db000 100644 --- a/git-archive.html +++ b/git-archive.html @@ -764,7 +764,7 @@

GIT

diff --git a/git-backfill.html b/git-backfill.html index 3b424b0ff..6e1538fdc 100644 --- a/git-backfill.html +++ b/git-backfill.html @@ -541,7 +541,7 @@

GIT

diff --git a/git-bisect-lk2009.html b/git-bisect-lk2009.html index 087e0cefa..71fe86305 100644 --- a/git-bisect-lk2009.html +++ b/git-bisect-lk2009.html @@ -2133,7 +2133,7 @@

References

diff --git a/git-bisect.html b/git-bisect.html index 32e370872..891982722 100644 --- a/git-bisect.html +++ b/git-bisect.html @@ -1091,7 +1091,7 @@

GIT

diff --git a/git-bugreport.html b/git-bugreport.html index 0d3173367..8044f2ce2 100644 --- a/git-bugreport.html +++ b/git-bugreport.html @@ -570,7 +570,7 @@

GIT

diff --git a/git-bundle.html b/git-bundle.html index 5e154439f..f49004215 100644 --- a/git-bundle.html +++ b/git-bundle.html @@ -920,7 +920,7 @@

GIT

diff --git a/git-check-attr.html b/git-check-attr.html index 74e5a5e97..04144e51f 100644 --- a/git-check-attr.html +++ b/git-check-attr.html @@ -642,7 +642,7 @@

GIT

diff --git a/git-check-ignore.html b/git-check-ignore.html index fda1b00c1..a30c186a3 100644 --- a/git-check-ignore.html +++ b/git-check-ignore.html @@ -618,7 +618,7 @@

GIT

diff --git a/git-check-mailmap.html b/git-check-mailmap.html index 145339383..d73f4c97f 100644 --- a/git-check-mailmap.html +++ b/git-check-mailmap.html @@ -532,7 +532,7 @@

GIT

diff --git a/git-check-ref-format.html b/git-check-ref-format.html index 7b93f663e..6edd8b04e 100644 --- a/git-check-ref-format.html +++ b/git-check-ref-format.html @@ -641,7 +641,7 @@

GIT

diff --git a/git-checkout-index.html b/git-checkout-index.html index 93d594e32..1ae92248b 100644 --- a/git-checkout-index.html +++ b/git-checkout-index.html @@ -693,7 +693,7 @@

GIT

diff --git a/git-checkout.adoc b/git-checkout.adoc index ee83b6d9b..40e02cfd6 100644 --- a/git-checkout.adoc +++ b/git-checkout.adoc @@ -289,6 +289,8 @@ section of linkgit:git-add[1] to learn how to operate the `--patch` mode. Note that this option uses the no overlay mode by default (see also `--overlay`), and currently doesn't support overlay mode. +include::diff-context-options.adoc[] + `--ignore-other-worktrees`:: `git checkout` refuses when the wanted branch is already checked out or otherwise in use by another worktree. This option makes diff --git a/git-checkout.html b/git-checkout.html index 11e178c12..f833f2f3c 100644 --- a/git-checkout.html +++ b/git-checkout.html @@ -789,6 +789,19 @@

OPTIONS

--overlay), and currently doesn’t support overlay mode.

+
-U<n>
+
--unified=<n>
+
+

Generate diffs with <n> lines of context. Defaults to diff.context +or 3 if the config option is unset.

+
+
--inter-hunk-context=<n>
+
+

Show the context between diff hunks, up to the specified <number> +of lines, thereby fusing hunks that are close to each other. +Defaults to diff.interHunkContext or 0 if the config option +is unset.

+
--ignore-other-worktrees

git checkout refuses when the wanted branch is already checked @@ -1289,7 +1302,7 @@

GIT

diff --git a/git-cherry-pick.html b/git-cherry-pick.html index 86a3e2ea6..90c99e323 100644 --- a/git-cherry-pick.html +++ b/git-cherry-pick.html @@ -824,7 +824,7 @@

GIT

diff --git a/git-cherry.html b/git-cherry.html index 531cef5fe..e320f3d4f 100644 --- a/git-cherry.html +++ b/git-cherry.html @@ -631,7 +631,7 @@

GIT

diff --git a/git-citool.html b/git-citool.html index 15b6b0c1f..81bb7fc07 100644 --- a/git-citool.html +++ b/git-citool.html @@ -482,7 +482,7 @@

GIT

diff --git a/git-clean.html b/git-clean.html index 5f5401658..fe53a4650 100644 --- a/git-clean.html +++ b/git-clean.html @@ -653,7 +653,7 @@

GIT

diff --git a/git-clone.html b/git-clone.html index fdeee2223..54f121517 100644 --- a/git-clone.html +++ b/git-clone.html @@ -1151,7 +1151,7 @@

GIT

diff --git a/git-column.html b/git-column.html index 4811c5dd9..4e288d765 100644 --- a/git-column.html +++ b/git-column.html @@ -669,7 +669,7 @@

GIT

diff --git a/git-commit-graph.html b/git-commit-graph.html index 8c605f573..32160d8da 100644 --- a/git-commit-graph.html +++ b/git-commit-graph.html @@ -717,7 +717,7 @@

GIT

diff --git a/git-commit-tree.html b/git-commit-tree.html index 0ddeb1faa..1ad4f902f 100644 --- a/git-commit-tree.html +++ b/git-commit-tree.html @@ -729,7 +729,7 @@

GIT

diff --git a/git-commit.adoc b/git-commit.adoc index dc219025f..ae988a883 100644 --- a/git-commit.adoc +++ b/git-commit.adoc @@ -76,6 +76,8 @@ OPTIONS which changes to commit. See linkgit:git-add[1] for details. +include::diff-context-options.adoc[] + `-C `:: `--reuse-message=`:: Take an existing __ object, and reuse the log message diff --git a/git-commit.html b/git-commit.html index aae05f4a8..11ab92f2c 100644 --- a/git-commit.html +++ b/git-commit.html @@ -541,6 +541,19 @@

OPTIONS

which changes to commit. See git-add(1) for details.

+
-U<n>
+
--unified=<n>
+
+

Generate diffs with <n> lines of context. Defaults to diff.context +or 3 if the config option is unset.

+
+
--inter-hunk-context=<n>
+
+

Show the context between diff hunks, up to the specified <number> +of lines, thereby fusing hunks that are close to each other. +Defaults to diff.interHunkContext or 0 if the config option +is unset.

+
-C <commit>
--reuse-message=<commit>
@@ -1407,7 +1420,7 @@

GIT

diff --git a/git-config.html b/git-config.html index 1e27e83bf..c8b76674e 100644 --- a/git-config.html +++ b/git-config.html @@ -3862,13 +3862,6 @@

Variables

Defaults to PERL5LIB to account for the fact that Git for Windows insists on using its own Perl interpreter.

-
core.restrictinheritedhandles
-
-

Windows-only: override whether spawned processes inherit only standard -file handles (stdin, stdout and stderr) or all handles. Can be -auto, true or false. Defaults to auto, which means true on -Windows 7 and later, and false on older Windows versions.

-
core.createObject

You can set this to link, in which case a hardlink followed by diff --git a/git-count-objects.html b/git-count-objects.html index de5ebf1bf..d8a4a8f26 100644 --- a/git-count-objects.html +++ b/git-count-objects.html @@ -525,7 +525,7 @@

GIT

diff --git a/git-credential-cache--daemon.html b/git-credential-cache--daemon.html index 5cc16b0e9..f95d49653 100644 --- a/git-credential-cache--daemon.html +++ b/git-credential-cache--daemon.html @@ -496,7 +496,7 @@

GIT

diff --git a/git-credential-cache.html b/git-credential-cache.html index 892364d08..470ff4d81 100644 --- a/git-credential-cache.html +++ b/git-credential-cache.html @@ -578,7 +578,7 @@

GIT

diff --git a/git-credential-store.html b/git-credential-store.html index 041ddbdd6..fb12bb5b7 100644 --- a/git-credential-store.html +++ b/git-credential-store.html @@ -604,7 +604,7 @@

GIT

diff --git a/git-credential.html b/git-credential.html index 38f284ee3..104217129 100644 --- a/git-credential.html +++ b/git-credential.html @@ -809,7 +809,7 @@

GIT

diff --git a/git-cvsexportcommit.html b/git-cvsexportcommit.html index df3db625b..21f52c69b 100644 --- a/git-cvsexportcommit.html +++ b/git-cvsexportcommit.html @@ -614,7 +614,7 @@

GIT

diff --git a/git-cvsimport.html b/git-cvsimport.html index 31338b470..b7e6e30c3 100644 --- a/git-cvsimport.html +++ b/git-cvsimport.html @@ -763,7 +763,7 @@

GIT

diff --git a/git-cvsserver.html b/git-cvsserver.html index 6cf047d47..771fa6f08 100644 --- a/git-cvsserver.html +++ b/git-cvsserver.html @@ -1040,7 +1040,7 @@

GIT

diff --git a/git-describe.html b/git-describe.html index 8626784f8..60ab4d888 100644 --- a/git-describe.html +++ b/git-describe.html @@ -721,7 +721,7 @@

GIT

diff --git a/git-diagnose.html b/git-diagnose.html index 038c767cf..082ff1fde 100644 --- a/git-diagnose.html +++ b/git-diagnose.html @@ -548,7 +548,7 @@

GIT

diff --git a/git-difftool.html b/git-difftool.html index 8f6bd9c61..bfe8f93b8 100644 --- a/git-difftool.html +++ b/git-difftool.html @@ -796,7 +796,7 @@

GIT

diff --git a/git-fast-import.adoc b/git-fast-import.adoc index d23278420..6f9763c11 100644 --- a/git-fast-import.adoc +++ b/git-fast-import.adoc @@ -182,7 +182,7 @@ amount of memory usage and processing time. Assuming the frontend is able to keep up with fast-import and feed it a constant stream of data, import times for projects holding 10+ years of history and containing 100,000+ individual commits are generally completed in just 1-2 -hours on quite modest (~$2,000 USD) hardware. +hours on quite modest hardware (~$2,000 USD in 2007). Most bottlenecks appear to be in foreign source data access (the source just cannot extract revisions fast enough) or disk IO (fast-import diff --git a/git-fast-import.html b/git-fast-import.html index a06e3d591..e032e8117 100644 --- a/git-fast-import.html +++ b/git-fast-import.html @@ -680,7 +680,7 @@

PERFORMANCE

is able to keep up with fast-import and feed it a constant stream of data, import times for projects holding 10+ years of history and containing 100,000+ individual commits are generally completed in just 1-2 -hours on quite modest (~$2,000 USD) hardware.

+hours on quite modest hardware (~$2,000 USD in 2007).

Most bottlenecks appear to be in foreign source data access (the @@ -2608,7 +2608,7 @@

GIT

diff --git a/git-fetch-pack.html b/git-fetch-pack.html index 652083ba8..507f5544d 100644 --- a/git-fetch-pack.html +++ b/git-fetch-pack.html @@ -623,7 +623,7 @@

GIT

diff --git a/git-fetch.html b/git-fetch.html index 4f3a064b5..f9ae2f7fd 100644 --- a/git-fetch.html +++ b/git-fetch.html @@ -1820,7 +1820,7 @@

GIT

diff --git a/git-filter-branch.html b/git-filter-branch.html index 56f6ff052..5e111f379 100644 --- a/git-filter-branch.html +++ b/git-filter-branch.html @@ -1319,7 +1319,7 @@

GIT

diff --git a/git-fmt-merge-msg.html b/git-fmt-merge-msg.html index 8bd95c685..3e9bfdab3 100644 --- a/git-fmt-merge-msg.html +++ b/git-fmt-merge-msg.html @@ -590,7 +590,7 @@

GIT

diff --git a/git-for-each-ref.adoc b/git-for-each-ref.adoc index ae61ba642..060940904 100644 --- a/git-for-each-ref.adoc +++ b/git-for-each-ref.adoc @@ -7,14 +7,14 @@ git-for-each-ref - Output information on each ref SYNOPSIS -------- -[verse] -'git for-each-ref' [--count=] [--shell|--perl|--python|--tcl] +[synopsis] +git for-each-ref [--count=] [--shell|--perl|--python|--tcl] [(--sort=)...] [--format=] - [--include-root-refs] [ --stdin | ... ] - [--points-at=] + [--include-root-refs] [--points-at=] [--merged[=]] [--no-merged[=]] [--contains[=]] [--no-contains[=]] - [--exclude= ...] [--start-after=] + [(--exclude=)...] [--start-after=] + [ --stdin | ... ] DESCRIPTION ----------- @@ -114,7 +114,8 @@ TAB %(refname)`. deleted, modified or added between invocations. Output will only yield those references which follow the marker lexicographically. Output begins from the first reference that would come after the marker alphabetically. Cannot be - used with general pattern matching or custom sort options. + used with `--sort=` or `--stdin` options, or the __ argument(s) + to limit the refs. FIELD NAMES ----------- diff --git a/git-for-each-ref.html b/git-for-each-ref.html index 09dd0f3d9..8fc0de5fa 100644 --- a/git-for-each-ref.html +++ b/git-for-each-ref.html @@ -452,13 +452,13 @@

NAME

SYNOPSIS

-
git for-each-ref [--count=<count>] [--shell|--perl|--python|--tcl]
-                   [(--sort=<key>)…​] [--format=<format>]
-                   [--include-root-refs] [ --stdin | <pattern>…​ ]
-                   [--points-at=<object>]
-                   [--merged[=<object>]] [--no-merged[=<object>]]
-                   [--contains[=<object>]] [--no-contains[=<object>]]
-                   [--exclude=<pattern> …​] [--start-after=<marker>]
+
git for-each-ref [--count=<count>] [--shell|--perl|--python|--tcl]
+		   [(--sort=<key>)…​] [--format=<format>]
+		   [--include-root-refs] [--points-at=<object>]
+		   [--merged[=<object>]] [--no-merged[=<object>]]
+		   [--contains[=<object>]] [--no-contains[=<object>]]
+		   [(--exclude=<pattern>)…​] [--start-after=<marker>]
+		   [ --stdin | <pattern>…​ ]
@@ -584,7 +584,8 @@

OPTIONS

deleted, modified or added between invocations. Output will only yield those references which follow the marker lexicographically. Output begins from the first reference that would come after the marker alphabetically. Cannot be -used with general pattern matching or custom sort options.

+used with --sort=<key> or --stdin options, or the <pattern> argument(s) +to limit the refs.

@@ -1147,7 +1148,7 @@

GIT

diff --git a/git-for-each-repo.html b/git-for-each-repo.html index a96722c09..0d76e5ed7 100644 --- a/git-for-each-repo.html +++ b/git-for-each-repo.html @@ -539,7 +539,7 @@

GIT

diff --git a/git-fsck-objects.html b/git-fsck-objects.html index 5e9419ceb..43ccf5b3e 100644 --- a/git-fsck-objects.html +++ b/git-fsck-objects.html @@ -476,7 +476,7 @@

GIT

diff --git a/git-fsck.html b/git-fsck.html index ed0600f90..334c2949d 100644 --- a/git-fsck.html +++ b/git-fsck.html @@ -1101,7 +1101,7 @@

GIT

diff --git a/git-fsmonitor--daemon.html b/git-fsmonitor--daemon.html index 0849e2a23..f3a995a71 100644 --- a/git-fsmonitor--daemon.html +++ b/git-fsmonitor--daemon.html @@ -606,7 +606,7 @@

GIT

diff --git a/git-gc.html b/git-gc.html index 9c1c7d08d..0f63e7950 100644 --- a/git-gc.html +++ b/git-gc.html @@ -901,7 +901,7 @@

GIT

diff --git a/git-get-tar-commit-id.html b/git-get-tar-commit-id.html index 9c5e1bb3e..5a79c1329 100644 --- a/git-get-tar-commit-id.html +++ b/git-get-tar-commit-id.html @@ -484,7 +484,7 @@

GIT

diff --git a/git-grep.html b/git-grep.html index 4688b1eb8..d825e8569 100644 --- a/git-grep.html +++ b/git-grep.html @@ -932,7 +932,7 @@

GIT

diff --git a/git-gui.html b/git-gui.html index c6c336689..37ea97c7c 100644 --- a/git-gui.html +++ b/git-gui.html @@ -612,7 +612,7 @@

GIT

diff --git a/git-hash-object.html b/git-hash-object.html index f1f53f1eb..58db9c86e 100644 --- a/git-hash-object.html +++ b/git-hash-object.html @@ -533,7 +533,7 @@

GIT

diff --git a/git-help.html b/git-help.html index 0d1c176d3..0861f27d1 100644 --- a/git-help.html +++ b/git-help.html @@ -753,7 +753,7 @@

GIT

diff --git a/git-hook.html b/git-hook.html index c4d4bc7d8..a0e71dc5f 100644 --- a/git-hook.html +++ b/git-hook.html @@ -524,7 +524,7 @@

GIT

diff --git a/git-http-backend.html b/git-http-backend.html index 33f8cee22..fc802302d 100644 --- a/git-http-backend.html +++ b/git-http-backend.html @@ -835,7 +835,7 @@

GIT

diff --git a/git-http-fetch.html b/git-http-fetch.html index a5945be60..9e984846a 100644 --- a/git-http-fetch.html +++ b/git-http-fetch.html @@ -537,7 +537,7 @@

GIT

diff --git a/git-http-push.html b/git-http-push.html index 29a811263..7e7e9bf85 100644 --- a/git-http-push.html +++ b/git-http-push.html @@ -592,7 +592,7 @@

GIT

diff --git a/git-index-pack.html b/git-index-pack.html index a8abda293..381fef090 100644 --- a/git-index-pack.html +++ b/git-index-pack.html @@ -660,7 +660,7 @@

GIT

diff --git a/git-init-db.html b/git-init-db.html index 538e03bd1..770c2b3f3 100644 --- a/git-init-db.html +++ b/git-init-db.html @@ -476,7 +476,7 @@

GIT

diff --git a/git-init.html b/git-init.html index cc1283049..d68880a83 100644 --- a/git-init.html +++ b/git-init.html @@ -749,7 +749,7 @@

GIT

diff --git a/git-instaweb.html b/git-instaweb.html index 1e2a7239b..a32c0a824 100644 --- a/git-instaweb.html +++ b/git-instaweb.html @@ -572,7 +572,7 @@

GIT

diff --git a/git-interpret-trailers.html b/git-interpret-trailers.html index bbf5ba7c8..35c4b97ef 100644 --- a/git-interpret-trailers.html +++ b/git-interpret-trailers.html @@ -1085,7 +1085,7 @@

GIT

diff --git a/git-ls-remote.html b/git-ls-remote.html index 2e6d1bb5c..f0b8630d7 100644 --- a/git-ls-remote.html +++ b/git-ls-remote.html @@ -650,7 +650,7 @@

GIT

diff --git a/git-mailinfo.html b/git-mailinfo.html index 1bf5e87d4..7ad36ed6f 100644 --- a/git-mailinfo.html +++ b/git-mailinfo.html @@ -640,7 +640,7 @@

GIT

diff --git a/git-mailsplit.html b/git-mailsplit.html index 2fa82e852..3025d82b7 100644 --- a/git-mailsplit.html +++ b/git-mailsplit.html @@ -538,7 +538,7 @@

GIT

diff --git a/git-maintenance.html b/git-maintenance.html index 7f0f67323..521604eea 100644 --- a/git-maintenance.html +++ b/git-maintenance.html @@ -1119,7 +1119,7 @@

GIT

diff --git a/git-merge-base.html b/git-merge-base.html index 1f94f1ea4..ff0bea89c 100644 --- a/git-merge-base.html +++ b/git-merge-base.html @@ -763,7 +763,7 @@

GIT

diff --git a/git-merge-file.html b/git-merge-file.html index 5775e63ed..a59ad8349 100644 --- a/git-merge-file.html +++ b/git-merge-file.html @@ -604,7 +604,7 @@

GIT

diff --git a/git-merge-index.html b/git-merge-index.html index ae7a7f77c..7cbd8a208 100644 --- a/git-merge-index.html +++ b/git-merge-index.html @@ -558,7 +558,7 @@

GIT

diff --git a/git-merge-one-file.html b/git-merge-one-file.html index acbe0e943..6647e14ae 100644 --- a/git-merge-one-file.html +++ b/git-merge-one-file.html @@ -476,7 +476,7 @@

GIT

diff --git a/git-merge-tree.html b/git-merge-tree.html index 88b9ed53c..0395ad08a 100644 --- a/git-merge-tree.html +++ b/git-merge-tree.html @@ -921,7 +921,7 @@

GIT

diff --git a/git-mergetool--lib.html b/git-mergetool--lib.html index b6f233095..86723fff4 100644 --- a/git-mergetool--lib.html +++ b/git-mergetool--lib.html @@ -522,7 +522,7 @@

GIT

diff --git a/git-mergetool.html b/git-mergetool.html index 92cea8f73..3440c7479 100644 --- a/git-mergetool.html +++ b/git-mergetool.html @@ -1018,7 +1018,7 @@

GIT

diff --git a/git-mktag.html b/git-mktag.html index b036ada2d..dd3308a36 100644 --- a/git-mktag.html +++ b/git-mktag.html @@ -545,7 +545,7 @@

GIT

diff --git a/git-mktree.html b/git-mktree.html index e8d6fc1f1..c247bbf2a 100644 --- a/git-mktree.html +++ b/git-mktree.html @@ -505,7 +505,7 @@

GIT

diff --git a/git-multi-pack-index.html b/git-multi-pack-index.html index 775e081e3..e22d5c813 100644 --- a/git-multi-pack-index.html +++ b/git-multi-pack-index.html @@ -673,7 +673,7 @@

GIT

diff --git a/git-mv.html b/git-mv.html index ac7b5c5ed..0bde99dd1 100644 --- a/git-mv.html +++ b/git-mv.html @@ -545,7 +545,7 @@

GIT

diff --git a/git-name-rev.html b/git-name-rev.html index d8bb9fede..9dfe6983f 100644 --- a/git-name-rev.html +++ b/git-name-rev.html @@ -590,7 +590,7 @@

GIT

diff --git a/git-notes.html b/git-notes.html index c68343954..eb77d074f 100644 --- a/git-notes.html +++ b/git-notes.html @@ -1041,7 +1041,7 @@

GIT

diff --git a/git-p4.html b/git-p4.html index 45c62e9ad..1b916647c 100644 --- a/git-p4.html +++ b/git-p4.html @@ -1514,7 +1514,7 @@

GIT

diff --git a/git-pack-redundant.html b/git-pack-redundant.html index d87566299..e8a2a8641 100644 --- a/git-pack-redundant.html +++ b/git-pack-redundant.html @@ -538,7 +538,7 @@

GIT

diff --git a/git-patch-id.html b/git-patch-id.html index 88e11c2ad..d5908606d 100644 --- a/git-patch-id.html +++ b/git-patch-id.html @@ -554,7 +554,7 @@

GIT

diff --git a/git-prune-packed.html b/git-prune-packed.html index 32cf037b7..07e07f793 100644 --- a/git-prune-packed.html +++ b/git-prune-packed.html @@ -516,7 +516,7 @@

GIT

diff --git a/git-prune.html b/git-prune.html index f74cc25f9..ce06dbbc1 100644 --- a/git-prune.html +++ b/git-prune.html @@ -577,7 +577,7 @@

GIT

diff --git a/git-push.html b/git-push.html index 24b9966be..004f35c78 100644 --- a/git-push.html +++ b/git-push.html @@ -1814,7 +1814,7 @@

GIT

diff --git a/git-quiltimport.html b/git-quiltimport.html index e93a2dfc7..f1d7e0be4 100644 --- a/git-quiltimport.html +++ b/git-quiltimport.html @@ -533,7 +533,7 @@

GIT

diff --git a/git-range-diff.html b/git-range-diff.html index b161621db..b6ae5c35a 100644 --- a/git-range-diff.html +++ b/git-range-diff.html @@ -832,7 +832,7 @@

GIT

diff --git a/git-read-tree.html b/git-read-tree.html index 74ccd3f63..c7fc7670c 100644 --- a/git-read-tree.html +++ b/git-read-tree.html @@ -997,7 +997,7 @@

GIT

diff --git a/git-reflog.html b/git-reflog.html index 18ea2ea74..353565fb4 100644 --- a/git-reflog.html +++ b/git-reflog.html @@ -638,7 +638,7 @@

GIT

diff --git a/git-refs.html b/git-refs.html index eb7aaf06a..556d375cc 100644 --- a/git-refs.html +++ b/git-refs.html @@ -575,7 +575,7 @@

GIT

diff --git a/git-remote-ext.html b/git-remote-ext.html index cc72ff827..b3b3e6785 100644 --- a/git-remote-ext.html +++ b/git-remote-ext.html @@ -627,7 +627,7 @@

GIT

diff --git a/git-remote-fd.html b/git-remote-fd.html index b0e8a910d..725ed776c 100644 --- a/git-remote-fd.html +++ b/git-remote-fd.html @@ -542,7 +542,7 @@

GIT

diff --git a/git-remote-helpers.html b/git-remote-helpers.html index 419e5eab4..7c3120cc9 100644 --- a/git-remote-helpers.html +++ b/git-remote-helpers.html @@ -457,7 +457,7 @@

git-remote-helpers

diff --git a/git-remote.html b/git-remote.html index 2c5f5e40f..f3c1b6f7e 100644 --- a/git-remote.html +++ b/git-remote.html @@ -777,7 +777,7 @@

GIT

diff --git a/git-repack.html b/git-repack.html index a195e5482..47c51feb7 100644 --- a/git-repack.html +++ b/git-repack.html @@ -799,7 +799,7 @@

GIT

diff --git a/git-replace.html b/git-replace.html index 38445df8b..00efe4659 100644 --- a/git-replace.html +++ b/git-replace.html @@ -669,7 +669,7 @@

GIT

diff --git a/git-request-pull.html b/git-request-pull.html index f33756cc4..c088c3cbf 100644 --- a/git-request-pull.html +++ b/git-request-pull.html @@ -563,7 +563,7 @@

GIT

diff --git a/git-rerere.html b/git-rerere.html index 7e7726d33..bd5e654c6 100644 --- a/git-rerere.html +++ b/git-rerere.html @@ -713,7 +713,7 @@

GIT

diff --git a/git-reset.adoc b/git-reset.adoc index 53ab88c54..50e8a0ba6 100644 --- a/git-reset.adoc +++ b/git-reset.adoc @@ -125,6 +125,8 @@ OPTIONS separated with _NUL_ character and all other characters are taken literally (including newlines and quotes). +include::diff-context-options.adoc[] + `--`:: Do not interpret any more arguments as options. diff --git a/git-reset.html b/git-reset.html index 68d4fc61b..ab59c58e2 100644 --- a/git-reset.html +++ b/git-reset.html @@ -605,6 +605,19 @@

OPTIONS

separated with NUL character and all other characters are taken literally (including newlines and quotes).

+
-U<n>
+
--unified=<n>
+
+

Generate diffs with <n> lines of context. Defaults to diff.context +or 3 if the config option is unset.

+
+
--inter-hunk-context=<n>
+
+

Show the context between diff hunks, up to the specified <number> +of lines, thereby fusing hunks that are close to each other. +Defaults to diff.interHunkContext or 0 if the config option +is unset.

+
--

Do not interpret any more arguments as options.

@@ -1145,7 +1158,7 @@

GIT

diff --git a/git-restore.adoc b/git-restore.adoc index 877b7772e..961eef013 100644 --- a/git-restore.adoc +++ b/git-restore.adoc @@ -28,8 +28,6 @@ otherwise from the index. Use `--source` to restore from a different commit. See "Reset, restore and revert" in linkgit:git[1] for the differences between the three commands. -THIS COMMAND IS EXPERIMENTAL. THE BEHAVIOR MAY CHANGE. - OPTIONS ------- `-s `:: @@ -52,6 +50,8 @@ leave out at most one of ___ and __, in which case it defaults to Mode" section of linkgit:git-add[1] to learn how to operate the `--patch` mode. +include::diff-context-options.adoc[] + `-W`:: `--worktree`:: `-S`:: diff --git a/git-restore.html b/git-restore.html index 31084bbaa..f660f94fe 100644 --- a/git-restore.html +++ b/git-restore.html @@ -479,9 +479,6 @@

DESCRIPTION

See "Reset, restore and revert" in git(1) for the differences between the three commands.

-
-

THIS COMMAND IS EXPERIMENTAL. THE BEHAVIOR MAY CHANGE.

-
@@ -513,6 +510,19 @@

OPTIONS

Mode" section of git-add(1) to learn how to operate the --patch mode.

+
-U<n>
+
--unified=<n>
+
+

Generate diffs with <n> lines of context. Defaults to diff.context +or 3 if the config option is unset.

+
+
--inter-hunk-context=<n>
+
+

Show the context between diff hunks, up to the specified <number> +of lines, thereby fusing hunks that are close to each other. +Defaults to diff.interHunkContext or 0 if the config option +is unset.

+
-W
--worktree
-S
@@ -734,7 +744,7 @@

GIT

diff --git a/git-rev-parse.html b/git-rev-parse.html index ee45a918e..3ec7fbaf3 100644 --- a/git-rev-parse.html +++ b/git-rev-parse.html @@ -1661,7 +1661,7 @@

GIT

diff --git a/git-revert.html b/git-revert.html index e07c838c6..f9bf0a156 100644 --- a/git-revert.html +++ b/git-revert.html @@ -706,7 +706,7 @@

GIT

diff --git a/git-rm.html b/git-rm.html index d33c6ab9e..7c8447b04 100644 --- a/git-rm.html +++ b/git-rm.html @@ -720,7 +720,7 @@

GIT

diff --git a/git-send-pack.html b/git-send-pack.html index a6eebc9bc..d2324ab38 100644 --- a/git-send-pack.html +++ b/git-send-pack.html @@ -656,7 +656,7 @@

GIT

diff --git a/git-sh-i18n--envsubst.html b/git-sh-i18n--envsubst.html index 23dc00f44..479b28e09 100644 --- a/git-sh-i18n--envsubst.html +++ b/git-sh-i18n--envsubst.html @@ -493,7 +493,7 @@

GIT

diff --git a/git-sh-i18n.html b/git-sh-i18n.html index 55fa33262..c7dc06cb9 100644 --- a/git-sh-i18n.html +++ b/git-sh-i18n.html @@ -507,7 +507,7 @@

GIT

diff --git a/git-sh-setup.html b/git-sh-setup.html index 59e7e7daf..34fa0c222 100644 --- a/git-sh-setup.html +++ b/git-sh-setup.html @@ -571,7 +571,7 @@

GIT

diff --git a/git-shell.html b/git-shell.html index 613c370a4..84118af5d 100644 --- a/git-shell.html +++ b/git-shell.html @@ -587,7 +587,7 @@

GIT

diff --git a/git-show-branch.html b/git-show-branch.html index 811cb83d3..44bbc9296 100644 --- a/git-show-branch.html +++ b/git-show-branch.html @@ -716,7 +716,7 @@

GIT

diff --git a/git-show-index.html b/git-show-index.html index 204b30a32..48bdeea1e 100644 --- a/git-show-index.html +++ b/git-show-index.html @@ -532,7 +532,7 @@

GIT

diff --git a/git-show-ref.html b/git-show-ref.html index b94d7c501..5704d5d32 100644 --- a/git-show-ref.html +++ b/git-show-ref.html @@ -712,7 +712,7 @@

GIT

diff --git a/git-sparse-checkout.html b/git-sparse-checkout.html index e15ae583a..c900d844e 100644 --- a/git-sparse-checkout.html +++ b/git-sparse-checkout.html @@ -1045,7 +1045,7 @@

GIT

diff --git a/git-stage.html b/git-stage.html index 5dcb9314c..7e87f65fe 100644 --- a/git-stage.html +++ b/git-stage.html @@ -476,7 +476,7 @@

GIT

diff --git a/git-stash.adoc b/git-stash.adoc index e5e6c9d37..e2300a19a 100644 --- a/git-stash.adoc +++ b/git-stash.adoc @@ -222,6 +222,8 @@ to learn how to operate the `--patch` mode. The `--patch` option implies `--keep-index`. You can use `--no-keep-index` to override this. +include::diff-context-options.adoc[] + -S:: --staged:: This option is only valid for `push` and `save` commands. diff --git a/git-stash.html b/git-stash.html index 31b9675a9..83546fea2 100644 --- a/git-stash.html +++ b/git-stash.html @@ -701,6 +701,19 @@

OPTIONS

--no-keep-index to override this.

+
-U<n>
+
--unified=<n>
+
+

Generate diffs with <n> lines of context. Defaults to diff.context +or 3 if the config option is unset.

+
+
--inter-hunk-context=<n>
+
+

Show the context between diff hunks, up to the specified <number> +of lines, thereby fusing hunks that are close to each other. +Defaults to diff.interHunkContext or 0 if the config option +is unset.

+
-S
--staged
@@ -990,7 +1003,7 @@

GIT

diff --git a/git-status.html b/git-status.html index 86efaf622..43cf93f70 100644 --- a/git-status.html +++ b/git-status.html @@ -1160,7 +1160,7 @@

GIT

diff --git a/git-stripspace.html b/git-stripspace.html index ae43de67c..50102b404 100644 --- a/git-stripspace.html +++ b/git-stripspace.html @@ -580,7 +580,7 @@

GIT

diff --git a/git-submodule.html b/git-submodule.html index bf0c2e19c..9bbdf7fdf 100644 --- a/git-submodule.html +++ b/git-submodule.html @@ -1040,7 +1040,7 @@

GIT

diff --git a/git-svn.html b/git-svn.html index ff98372b6..659cc206b 100644 --- a/git-svn.html +++ b/git-svn.html @@ -1978,7 +1978,7 @@

GIT

diff --git a/git-switch.adoc b/git-switch.adoc index 9f62abf9e..87707e926 100644 --- a/git-switch.adoc +++ b/git-switch.adoc @@ -29,8 +29,6 @@ Switching branches does not require a clean index and working tree however if the operation leads to loss of local changes, unless told otherwise with `--discard-changes` or `--merge`. -THIS COMMAND IS EXPERIMENTAL. THE BEHAVIOR MAY CHANGE. - OPTIONS ------- __:: diff --git a/git-switch.html b/git-switch.html index 28e74ab69..6bde7c7bb 100644 --- a/git-switch.html +++ b/git-switch.html @@ -479,9 +479,6 @@

DESCRIPTION

however if the operation leads to loss of local changes, unless told otherwise with --discard-changes or --merge.

-
-

THIS COMMAND IS EXPERIMENTAL. THE BEHAVIOR MAY CHANGE.

-
@@ -874,7 +871,7 @@

GIT

diff --git a/git-symbolic-ref.html b/git-symbolic-ref.html index ab0cb178c..cf684ac00 100644 --- a/git-symbolic-ref.html +++ b/git-symbolic-ref.html @@ -561,7 +561,7 @@

GIT

diff --git a/git-tools.html b/git-tools.html index bcf1437cf..2f6daa92a 100644 --- a/git-tools.html +++ b/git-tools.html @@ -457,7 +457,7 @@

Git Tools

diff --git a/git-unpack-file.html b/git-unpack-file.html index 06604f184..0e0725f07 100644 --- a/git-unpack-file.html +++ b/git-unpack-file.html @@ -490,7 +490,7 @@

GIT

diff --git a/git-unpack-objects.html b/git-unpack-objects.html index 73ec6e44f..ef7e2fa5f 100644 --- a/git-unpack-objects.html +++ b/git-unpack-objects.html @@ -520,7 +520,7 @@

GIT

diff --git a/git-update-index.html b/git-update-index.html index f1203e065..cdd89212d 100644 --- a/git-update-index.html +++ b/git-update-index.html @@ -1227,7 +1227,7 @@

GIT

diff --git a/git-update-ref.html b/git-update-ref.html index 1a92df6f3..cc0b642be 100644 --- a/git-update-ref.html +++ b/git-update-ref.html @@ -729,7 +729,7 @@

GIT

diff --git a/git-update-server-info.html b/git-update-server-info.html index 1d200c8c5..ad2df766b 100644 --- a/git-update-server-info.html +++ b/git-update-server-info.html @@ -513,7 +513,7 @@

GIT

diff --git a/git-upload-archive.html b/git-upload-archive.html index 95d551271..eb00f74f4 100644 --- a/git-upload-archive.html +++ b/git-upload-archive.html @@ -538,7 +538,7 @@

GIT

diff --git a/git-upload-pack.html b/git-upload-pack.html index 249b838ea..bc217d3a6 100644 --- a/git-upload-pack.html +++ b/git-upload-pack.html @@ -582,7 +582,7 @@

GIT

diff --git a/git-var.html b/git-var.html index f6364bd5f..ada329eb8 100644 --- a/git-var.html +++ b/git-var.html @@ -589,7 +589,7 @@

GIT

diff --git a/git-verify-commit.html b/git-verify-commit.html index 00c06f906..7b09b5072 100644 --- a/git-verify-commit.html +++ b/git-verify-commit.html @@ -495,7 +495,7 @@

GIT

diff --git a/git-verify-pack.html b/git-verify-pack.html index 0889e71ea..1dbf5ea7e 100644 --- a/git-verify-pack.html +++ b/git-verify-pack.html @@ -525,7 +525,7 @@

GIT

diff --git a/git-verify-tag.html b/git-verify-tag.html index 309c7cd22..03e67c2a6 100644 --- a/git-verify-tag.html +++ b/git-verify-tag.html @@ -495,7 +495,7 @@

GIT

diff --git a/git-version.html b/git-version.html index fe862a635..875477bd8 100644 --- a/git-version.html +++ b/git-version.html @@ -502,7 +502,7 @@

GIT

diff --git a/git-web--browse.html b/git-web--browse.html index 57699bad0..4dd5d37d0 100644 --- a/git-web--browse.html +++ b/git-web--browse.html @@ -642,7 +642,7 @@

GIT

diff --git a/git-worktree.html b/git-worktree.html index 5a6af3507..3f0aacb46 100644 --- a/git-worktree.html +++ b/git-worktree.html @@ -1097,7 +1097,7 @@

GIT

diff --git a/git-write-tree.html b/git-write-tree.html index 09c1ad19e..fa2f6379b 100644 --- a/git-write-tree.html +++ b/git-write-tree.html @@ -507,7 +507,7 @@

GIT

diff --git a/git.html b/git.html index 62718e7c3..37e0aa047 100644 --- a/git.html +++ b/git.html @@ -2699,7 +2699,7 @@

GIT

diff --git a/gitcli.html b/gitcli.html index ac79093c5..9aed41a32 100644 --- a/gitcli.html +++ b/gitcli.html @@ -789,7 +789,7 @@

GIT

diff --git a/gitcore-tutorial.html b/gitcore-tutorial.html index 0bc59ff21..b44d83ead 100644 --- a/gitcore-tutorial.html +++ b/gitcore-tutorial.html @@ -2633,7 +2633,7 @@

GIT

diff --git a/gitcredentials.html b/gitcredentials.html index 387ed3987..4df81ccc9 100644 --- a/gitcredentials.html +++ b/gitcredentials.html @@ -899,7 +899,7 @@

GIT

diff --git a/gitcvs-migration.html b/gitcvs-migration.html index af5c46e49..0a75d80c1 100644 --- a/gitcvs-migration.html +++ b/gitcvs-migration.html @@ -728,7 +728,7 @@

GIT

diff --git a/gitdiffcore.html b/gitdiffcore.html index 380a6c8a9..0092541d8 100644 --- a/gitdiffcore.html +++ b/gitdiffcore.html @@ -867,7 +867,7 @@

GIT

diff --git a/giteveryday.html b/giteveryday.html index 704e97198..5126da414 100644 --- a/giteveryday.html +++ b/giteveryday.html @@ -1139,7 +1139,7 @@

GIT

diff --git a/gitfaq.html b/gitfaq.html index 4c998e1c7..a8ca2365d 100644 --- a/gitfaq.html +++ b/gitfaq.html @@ -1161,7 +1161,7 @@

GIT

diff --git a/gitformat-bundle.html b/gitformat-bundle.html index b035444bb..2386136db 100644 --- a/gitformat-bundle.html +++ b/gitformat-bundle.html @@ -593,7 +593,7 @@

GIT

diff --git a/gitformat-chunk.html b/gitformat-chunk.html index 2a63cfe29..03c29fcfe 100644 --- a/gitformat-chunk.html +++ b/gitformat-chunk.html @@ -626,7 +626,7 @@

GIT

diff --git a/gitformat-commit-graph.html b/gitformat-commit-graph.html index 68d65c291..45222fed5 100644 --- a/gitformat-commit-graph.html +++ b/gitformat-commit-graph.html @@ -774,7 +774,7 @@

GIT

diff --git a/gitformat-index.html b/gitformat-index.html index 90add2d15..bdb263a8b 100644 --- a/gitformat-index.html +++ b/gitformat-index.html @@ -1193,7 +1193,7 @@

GIT

diff --git a/gitformat-pack.html b/gitformat-pack.html index aaeaa5aad..7aefd9f8e 100644 --- a/gitformat-pack.html +++ b/gitformat-pack.html @@ -1462,7 +1462,7 @@

GIT

diff --git a/gitformat-signature.html b/gitformat-signature.html index a72af1fbb..008763da4 100644 --- a/gitformat-signature.html +++ b/gitformat-signature.html @@ -756,7 +756,7 @@

GIT

diff --git a/githooks.html b/githooks.html index ee2cdbbb1..23be8fe9b 100644 --- a/githooks.html +++ b/githooks.html @@ -1400,7 +1400,7 @@

GIT

diff --git a/gitignore.html b/gitignore.html index e155cc6b2..c4a76f5a6 100644 --- a/gitignore.html +++ b/gitignore.html @@ -769,7 +769,7 @@

GIT

diff --git a/gitmailmap.html b/gitmailmap.html index a18e6e3e9..8bf5b145a 100644 --- a/gitmailmap.html +++ b/gitmailmap.html @@ -642,7 +642,7 @@

GIT

diff --git a/gitmodules.html b/gitmodules.html index a4e0c59c9..749e87114 100644 --- a/gitmodules.html +++ b/gitmodules.html @@ -635,7 +635,7 @@

GIT

diff --git a/gitnamespaces.html b/gitnamespaces.html index 1e90de729..7c013225d 100644 --- a/gitnamespaces.html +++ b/gitnamespaces.html @@ -569,7 +569,7 @@

GIT

diff --git a/gitpacking.html b/gitpacking.html index 1fe05b1b4..a59227625 100644 --- a/gitpacking.html +++ b/gitpacking.html @@ -821,7 +821,7 @@

GIT

diff --git a/gitprotocol-capabilities.html b/gitprotocol-capabilities.html index 5121aa1cf..da0b9b672 100644 --- a/gitprotocol-capabilities.html +++ b/gitprotocol-capabilities.html @@ -976,7 +976,7 @@

GIT

diff --git a/gitprotocol-common.html b/gitprotocol-common.html index bab0ee69d..8a76e56ca 100644 --- a/gitprotocol-common.html +++ b/gitprotocol-common.html @@ -605,7 +605,7 @@

GIT

diff --git a/gitprotocol-http.html b/gitprotocol-http.html index 4bbf7ed47..8b8062ece 100644 --- a/gitprotocol-http.html +++ b/gitprotocol-http.html @@ -1204,7 +1204,7 @@

GIT

diff --git a/gitprotocol-pack.html b/gitprotocol-pack.html index 60f851223..5c2ccb2e5 100644 --- a/gitprotocol-pack.html +++ b/gitprotocol-pack.html @@ -1358,7 +1358,7 @@

GIT

diff --git a/gitprotocol-v2.html b/gitprotocol-v2.html index 9aa562296..f16ff3e43 100644 --- a/gitprotocol-v2.html +++ b/gitprotocol-v2.html @@ -1602,7 +1602,7 @@

GIT

diff --git a/gitrepository-layout.html b/gitrepository-layout.html index 127c98b19..0e618c7a3 100644 --- a/gitrepository-layout.html +++ b/gitrepository-layout.html @@ -932,7 +932,7 @@

GIT

diff --git a/gitrevisions.html b/gitrevisions.html index 13b1a962b..35dd83a4a 100644 --- a/gitrevisions.html +++ b/gitrevisions.html @@ -1037,7 +1037,7 @@

GIT

diff --git a/gitsubmodules.html b/gitsubmodules.html index 6a850bf15..f3f8ebffb 100644 --- a/gitsubmodules.html +++ b/gitsubmodules.html @@ -867,7 +867,7 @@

GIT

diff --git a/gittutorial-2.html b/gittutorial-2.html index b2f5a70e2..034a57ab7 100644 --- a/gittutorial-2.html +++ b/gittutorial-2.html @@ -978,7 +978,7 @@

GIT

diff --git a/gittutorial.html b/gittutorial.html index 1055f767a..c69b2a568 100644 --- a/gittutorial.html +++ b/gittutorial.html @@ -1315,7 +1315,7 @@

GIT

diff --git a/gitworkflows.html b/gitworkflows.html index 30449ed51..ed8924f83 100644 --- a/gitworkflows.html +++ b/gitworkflows.html @@ -1067,7 +1067,7 @@

GIT

diff --git a/howto-index.html b/howto-index.html index b1bfcdd90..8baa30191 100644 --- a/howto-index.html +++ b/howto-index.html @@ -622,7 +622,7 @@

Git Howto Index

diff --git a/howto/coordinate-embargoed-releases.html b/howto/coordinate-embargoed-releases.html index e4ff98eb1..53ecc86e1 100644 --- a/howto/coordinate-embargoed-releases.html +++ b/howto/coordinate-embargoed-releases.html @@ -736,7 +736,7 @@

Example mail to diff --git a/howto/keep-canonical-history-correct.html b/howto/keep-canonical-history-correct.html index e366ddcc0..1f6d18037 100644 --- a/howto/keep-canonical-history-correct.html +++ b/howto/keep-canonical-history-correct.html @@ -703,7 +703,7 @@

Keep authoritative canonical history correct with git pull

diff --git a/howto/maintain-git.html b/howto/maintain-git.html index 8c6c8e125..fec9354dd 100644 --- a/howto/maintain-git.html +++ b/howto/maintain-git.html @@ -1324,7 +1324,7 @@

Preparing a "merge-fix"

diff --git a/howto/new-command.html b/howto/new-command.html index dce8bc275..41de3f918 100644 --- a/howto/new-command.html +++ b/howto/new-command.html @@ -582,7 +582,7 @@

Integrating a command

diff --git a/howto/rebase-from-internal-branch.html b/howto/rebase-from-internal-branch.html index f8951f1ed..d1fa99c87 100644 --- a/howto/rebase-from-internal-branch.html +++ b/howto/rebase-from-internal-branch.html @@ -654,7 +654,7 @@

How to rebase from an internal branch

diff --git a/howto/rebuild-from-update-hook.html b/howto/rebuild-from-update-hook.html index 684dea24a..9b5e9d249 100644 --- a/howto/rebuild-from-update-hook.html +++ b/howto/rebuild-from-update-hook.html @@ -561,7 +561,7 @@

How to rebuild from update hook

diff --git a/howto/recover-corrupted-blob-object.html b/howto/recover-corrupted-blob-object.html index 90bf333c6..73af58423 100644 --- a/howto/recover-corrupted-blob-object.html +++ b/howto/recover-corrupted-blob-object.html @@ -639,7 +639,7 @@

How to recover a corrupted blob object

diff --git a/howto/recover-corrupted-object-harder.html b/howto/recover-corrupted-object-harder.html index 9ab8421bb..c2691b18a 100644 --- a/howto/recover-corrupted-object-harder.html +++ b/howto/recover-corrupted-object-harder.html @@ -965,7 +965,7 @@

The adventure continues…​

diff --git a/howto/revert-a-faulty-merge.html b/howto/revert-a-faulty-merge.html index 84b2da708..2e6656ea3 100644 --- a/howto/revert-a-faulty-merge.html +++ b/howto/revert-a-faulty-merge.html @@ -827,7 +827,7 @@

How to revert a faulty merge

diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html index 5b23ef2b4..afee7833e 100644 --- a/howto/revert-branch-rebase.html +++ b/howto/revert-branch-rebase.html @@ -647,7 +647,7 @@

How to revert an existing commit

diff --git a/howto/separating-topic-branches.html b/howto/separating-topic-branches.html index 9dcde9311..89464cd94 100644 --- a/howto/separating-topic-branches.html +++ b/howto/separating-topic-branches.html @@ -566,7 +566,7 @@

How to separate topic branches

diff --git a/howto/setup-git-server-over-http.html b/howto/setup-git-server-over-http.html index 75dea1a88..6a4e22da3 100644 --- a/howto/setup-git-server-over-http.html +++ b/howto/setup-git-server-over-http.html @@ -880,7 +880,7 @@

Troubleshooting:

diff --git a/howto/update-hook-example.html b/howto/update-hook-example.html index 04a96ade3..f078e13f8 100644 --- a/howto/update-hook-example.html +++ b/howto/update-hook-example.html @@ -646,7 +646,7 @@

How to use the update hook

diff --git a/howto/use-git-daemon.html b/howto/use-git-daemon.html index e0f1a84d9..cf408fe8e 100644 --- a/howto/use-git-daemon.html +++ b/howto/use-git-daemon.html @@ -522,7 +522,7 @@

How to use git-daemon

diff --git a/howto/using-merge-subtree.html b/howto/using-merge-subtree.html index 3c568f61a..9586410d4 100644 --- a/howto/using-merge-subtree.html +++ b/howto/using-merge-subtree.html @@ -552,7 +552,7 @@

Additional tips

diff --git a/howto/using-signed-tag-in-pull-request.html b/howto/using-signed-tag-in-pull-request.html index fcd3f2923..e0cc6c850 100644 --- a/howto/using-signed-tag-in-pull-request.html +++ b/howto/using-signed-tag-in-pull-request.html @@ -710,7 +710,7 @@

Auditors

diff --git a/scalar.html b/scalar.html index d77f39e66..1818501ee 100644 --- a/scalar.html +++ b/scalar.html @@ -725,7 +725,7 @@

GIT

diff --git a/technical/api-error-handling.html b/technical/api-error-handling.html index 04e5a50ab..f9cc28724 100644 --- a/technical/api-error-handling.html +++ b/technical/api-error-handling.html @@ -591,7 +591,7 @@

Caller-handled errors

diff --git a/technical/api-index.html b/technical/api-index.html index fd7183b57..3d736dfe7 100644 --- a/technical/api-index.html +++ b/technical/api-index.html @@ -468,7 +468,7 @@

Git API Documents

diff --git a/technical/api-merge.html b/technical/api-merge.html index 99d49b0c6..622650a70 100644 --- a/technical/api-merge.html +++ b/technical/api-merge.html @@ -505,7 +505,7 @@

Low-level (single file) merge

diff --git a/technical/api-parse-options.html b/technical/api-parse-options.html index b360330d7..24a6ac108 100644 --- a/technical/api-parse-options.html +++ b/technical/api-parse-options.html @@ -925,7 +925,7 @@

Examples

diff --git a/technical/api-path-walk.html b/technical/api-path-walk.html index 09ddbcbce..e2d9cfade 100644 --- a/technical/api-path-walk.html +++ b/technical/api-path-walk.html @@ -545,7 +545,7 @@

Examples

diff --git a/technical/api-simple-ipc.html b/technical/api-simple-ipc.html index 8cd3ba2d8..1cda862a3 100644 --- a/technical/api-simple-ipc.html +++ b/technical/api-simple-ipc.html @@ -566,7 +566,7 @@

Summary

diff --git a/technical/api-trace2.html b/technical/api-trace2.html index 1288e2998..3878e2675 100644 --- a/technical/api-trace2.html +++ b/technical/api-trace2.html @@ -2064,7 +2064,7 @@

Relationship to t diff --git a/technical/bitmap-format.html b/technical/bitmap-format.html index 80f2ce7df..f1a33f50c 100644 --- a/technical/bitmap-format.html +++ b/technical/bitmap-format.html @@ -1086,7 +1086,7 @@

File format

diff --git a/technical/build-systems.html b/technical/build-systems.html index 8935fffc7..46db5471e 100644 --- a/technical/build-systems.html +++ b/technical/build-systems.html @@ -937,7 +937,7 @@

Meson

diff --git a/technical/bundle-uri.html b/technical/bundle-uri.html index 2aa01239f..dd664ab46 100644 --- a/technical/bundle-uri.html +++ b/technical/bundle-uri.html @@ -1218,7 +1218,7 @@

See Also

diff --git a/technical/hash-function-transition.html b/technical/hash-function-transition.html index 27ea372c3..02f68bcf5 100644 --- a/technical/hash-function-transition.html +++ b/technical/hash-function-transition.html @@ -1805,7 +1805,7 @@

Document History

diff --git a/technical/long-running-process-protocol.html b/technical/long-running-process-protocol.html index 2073520f8..edb3daee9 100644 --- a/technical/long-running-process-protocol.html +++ b/technical/long-running-process-protocol.html @@ -504,7 +504,7 @@

Shutdown

diff --git a/technical/multi-pack-index.html b/technical/multi-pack-index.html index efe654282..594aab949 100644 --- a/technical/multi-pack-index.html +++ b/technical/multi-pack-index.html @@ -813,7 +813,7 @@

Related Links

diff --git a/technical/pack-heuristics.html b/technical/pack-heuristics.html index 02575790c..18b2b27d7 100644 --- a/technical/pack-heuristics.html +++ b/technical/pack-heuristics.html @@ -1210,7 +1210,7 @@

Concerning Git’s Packing Heuristics

diff --git a/technical/parallel-checkout.html b/technical/parallel-checkout.html index c1b5f6bc5..1687a6755 100644 --- a/technical/parallel-checkout.html +++ b/technical/parallel-checkout.html @@ -798,7 +798,7 @@

The API

diff --git a/technical/partial-clone.html b/technical/partial-clone.html index c3688f3b2..6e37335f4 100644 --- a/technical/partial-clone.html +++ b/technical/partial-clone.html @@ -947,7 +947,7 @@

Related Links

diff --git a/technical/platform-support.html b/technical/platform-support.html index 0e01a3566..81f96b426 100644 --- a/technical/platform-support.html +++ b/technical/platform-support.html @@ -722,7 +722,7 @@

Platform Maintainers

diff --git a/technical/racy-git.html b/technical/racy-git.html index 49408c168..393e425b7 100644 --- a/technical/racy-git.html +++ b/technical/racy-git.html @@ -690,7 +690,7 @@

Avoiding runtime penalty

diff --git a/technical/reftable.html b/technical/reftable.html index a557d5dcd..f60151857 100644 --- a/technical/reftable.html +++ b/technical/reftable.html @@ -1994,7 +1994,7 @@

LMDB

diff --git a/technical/scalar.html b/technical/scalar.html index 63b057a81..9205cbabd 100644 --- a/technical/scalar.html +++ b/technical/scalar.html @@ -539,7 +539,7 @@

Design

diff --git a/technical/send-pack-pipeline.html b/technical/send-pack-pipeline.html index ae9acf6c0..eab5598aa 100644 --- a/technical/send-pack-pipeline.html +++ b/technical/send-pack-pipeline.html @@ -528,7 +528,7 @@

Pack_objects pipeline

diff --git a/technical/shallow.html b/technical/shallow.html index 7c5d32a31..0fd909864 100644 --- a/technical/shallow.html +++ b/technical/shallow.html @@ -520,7 +520,7 @@

Shallow commits

diff --git a/technical/trivial-merge.html b/technical/trivial-merge.html index 0e326a1c4..1b7b70c60 100644 --- a/technical/trivial-merge.html +++ b/technical/trivial-merge.html @@ -601,7 +601,7 @@

Three-way merge

diff --git a/technical/unit-tests.html b/technical/unit-tests.html index a9306d0d1..ca142ae3f 100644 --- a/technical/unit-tests.html +++ b/technical/unit-tests.html @@ -924,7 +924,7 @@

Milestones

diff --git a/user-manual.adoc b/user-manual.adoc index 8d00a9e82..769698711 100644 --- a/user-manual.adoc +++ b/user-manual.adoc @@ -4270,7 +4270,7 @@ So, look into `builtin/cat-file.c`, search for `cmd_cat_file()` and look what it does. ------------------------------------------------------------------ - git_config(git_default_config); + repo_config(the_repository, git_default_config); if (argc != 3) usage("git cat-file [-t|-s|-e|-p|] "); if (get_sha1(argv[2], sha1)) diff --git a/user-manual.html b/user-manual.html index e451b82d0..092f99bdd 100644 --- a/user-manual.html +++ b/user-manual.html @@ -3060,7 +3060,7 @@

So, look into builtin/cat-file.c, search for cmd_cat_file() and look what it does.

-
        git_config(git_default_config);
+
        repo_config(the_repository, git_default_config);
         if (argc != 3)
                 usage("git cat-file [-t|-s|-e|-p|<type>] <sha1>");
         if (get_sha1(argv[2], sha1))