diff options
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/RelNotes/2.22.1.txt | 2 | ||||
| -rw-r--r-- | Documentation/RelNotes/2.23.0.txt | 88 | ||||
| -rw-r--r-- | Documentation/config/log.txt | 2 | ||||
| -rw-r--r-- | Documentation/config/transfer.txt | 2 | ||||
| -rw-r--r-- | Documentation/git-cvsserver.txt | 2 | ||||
| -rw-r--r-- | Documentation/git-fetch.txt | 4 | ||||
| -rw-r--r-- | Documentation/git-fsck.txt | 5 | ||||
| -rw-r--r-- | Documentation/git-pull.txt | 2 | ||||
| -rw-r--r-- | Documentation/git-restore.txt | 2 | ||||
| -rw-r--r-- | Documentation/glossary-content.txt | 2 | ||||
| -rw-r--r-- | Documentation/technical/api-ref-iteration.txt | 2 |
11 files changed, 28 insertions, 85 deletions
diff --git a/Documentation/RelNotes/2.22.1.txt b/Documentation/RelNotes/2.22.1.txt index 78b2c5ea8a..76dd8fb578 100644 --- a/Documentation/RelNotes/2.22.1.txt +++ b/Documentation/RelNotes/2.22.1.txt @@ -94,7 +94,7 @@ Fixes since v2.22 * The configuration variable rebase.rescheduleFailedExec should be effective only while running an interactive rebase and should not - affect anything when running an non-interactive one, which was not + affect anything when running a non-interactive one, which was not the case. This has been corrected. * "git submodule foreach" did not protect command line options passed diff --git a/Documentation/RelNotes/2.23.0.txt b/Documentation/RelNotes/2.23.0.txt index 9896599b2f..e3c4e78265 100644 --- a/Documentation/RelNotes/2.23.0.txt +++ b/Documentation/RelNotes/2.23.0.txt @@ -10,6 +10,9 @@ Backward compatibility note prerequisite patches in an unstable way, which has been updated to compute in a way that is compatible with "git patch-id --stable". + * The "git log" command by default behaves as if the --mailmap option + was given. + UI, Workflows & Features @@ -52,7 +55,7 @@ UI, Workflows & Features * "git fetch" and "git pull" reports when a fetch results in non-fast-forward updates to let the user notice unusual situation. - The commands learned "--no-shown-forced-updates" option to disable + The commands learned "--no-show-forced-updates" option to disable this safety feature. * Two new commands "git switch" and "git restore" are introduced to @@ -68,7 +71,7 @@ UI, Workflows & Features * The conditional inclusion mechanism learned to base the choice on the branch the HEAD currently is on. - * "git rev-list --objects" learned with "--no-object-names" option to + * "git rev-list --objects" learned the "--no-object-names" option to squelch the path to the object that is used as a grouping hint for pack-objects. @@ -91,11 +94,6 @@ UI, Workflows & Features commit-graph files now, which allows the commit-graph files to be updated incrementally. - * The "git log" command learns to issue a warning when log.mailmap - configuration is not set and --[no-]mailmap option is not used, to - prepare users for future versions of Git that uses the mailmap by - default. - * "git range-diff" output has been tweaked for easier identification of which part of what file the patch shown is about. @@ -106,7 +104,7 @@ Performance, Internal Implementation, Development Support etc. no longer be used. * Developer support to emulate unsatisfied prerequisites in tests to - ensure that the remainer of the tests still succeeds when tests + ensure that the remainder of the tests still succeeds when tests with prerequisites are skipped. * "git update-server-info" learned not to rewrite the file with the @@ -121,7 +119,7 @@ Performance, Internal Implementation, Development Support etc. * Prepare use of reachability index in topological walker that works on a range (A..B). - * A new tutorial targetting specifically aspiring git-core + * A new tutorial targeting specifically aspiring git-core developers has been added. * Auto-detect how to tell HP-UX aCC where to use dynamically linked @@ -163,7 +161,6 @@ Performance, Internal Implementation, Development Support etc. * We have been trying out a few language features outside c89; the coding guidelines document did not talk about them and instead had a blanket ban against them. - (merge cc0c42975a jc/post-c89-rules-doc later to maint). * A test helper has been introduced to optimize preparation of test repositories with many simple commits, and a handful of test @@ -177,16 +174,13 @@ Fixes since v2.22 ought to be relative to the directory "git init" gets invoked in, but it instead was made relative to the repository, which has been corrected. - (merge e1df7fe43f nd/init-relative-template-fix later to maint). * "git worktree add" used to fail when another worktree connected to the same repository was corrupt, which has been corrected. - (merge 105df73e71 nd/corrupt-worktrees later to maint). * The ownership rule for the file descriptor to fast-import remote - backend was mixed up, leading to unrelated file descriptor getting + backend was mixed up, leading to an unrelated file descriptor getting closed, which has been fixed. - (merge 3203566a71 mh/import-transport-fd-fix later to maint). * A "merge -c" instruction during "git rebase --rebase-merges" should give the user a chance to edit the log message, even when there is @@ -195,82 +189,65 @@ Fixes since v2.22 corrected. * Code cleanup and futureproof. - (merge 31f5256c82 ds/object-info-for-prefetch-fix later to maint). * More parameter validation. - (merge de99eb0c24 es/grep-require-name-when-needed later to maint). * "git update-server-info" used to leave stale packfiles in its output, which has been corrected. - (merge e941c48d49 ew/server-info-remove-crufts later to maint). * The server side support for "git fetch" used to show incorrect value for the HEAD symbolic ref when the namespace feature is in use, which has been corrected. - (merge 533e088250 jk/HEAD-symref-in-xfer-namespaces later to maint). * "git am -i --resolved" segfaulted after trying to see a commit as if it were a tree, which has been corrected. - (merge 7663e438c5 jk/am-i-resolved-fix later to maint). * "git bundle verify" needs to see if prerequisite objects exist in the receiving repository, but the command did not check if we are in a repository upfront, which has been corrected. - (merge 3bbbe467f2 js/bundle-verify-require-object-store later to maint). * "git merge --squash" is designed to update the working tree and the index without creating the commit, and this cannot be countermanded by adding the "--commit" option; the command now refuses to work when both options are given. - (merge 1d14d0c994 vv/merge-squash-with-explicit-commit later to maint). * The data collected by fsmonitor was not properly written back to the on-disk index file, breaking t7519 tests occasionally, which has been corrected. - (merge b5a8169752 js/fsmonitor-unflake later to maint). * Update to Unicode 12.1 width table. - (merge 5817f9caa3 bb/unicode-12.1-reiwa later to maint). * The command line to invoke a "git cat-file" command from inside "git p4" was not properly quoted to protect a caret and running a broken command on Windows, which has been corrected. - (merge c3f2358de3 mm/p4-unshelve-windows-fix later to maint). * "git request-pull" learned to warn when the ref we ask them to pull from in the local repository and in the published repository are different. - (merge 0454220d66 pb/request-pull-verify-remote-ref later to maint). * When creating a partial clone, the object filtering criteria is recorded for the origin of the clone, but this incorrectly used a hardcoded name "origin" to name that remote; it has been corrected to honor the "--origin <name>" option. - (merge 1c4a9f9114 xl/record-partial-clone-origin later to maint). * "git fetch" into a lazy clone forgot to fetch base objects that are necessary to complete delta in a thin packfile, which has been corrected. - (merge 810e19322d jt/partial-clone-missing-ref-delta-base later to maint). * The filter_data used in the list-objects-filter (which manages a lazily sparse clone repository) did not use the dynamic array API correctly---'nr' is supposed to point at one past the last element of the array in use. This has been corrected. - (merge 7140600e2e md/list-objects-filter-memfix later to maint). * The description about slashes in gitignore patterns (used to indicate things like "anchored to this level only" and "only matches directories") has been revamped. - (merge 1a58bad014 an/ignore-doc-update later to maint). * The URL decoding code has been updated to avoid going past the end of the string while parsing %-<hex>-<hex> sequence. - (merge d37dc239a4 md/url-parse-harden later to maint). * The list of for-each like macros used by clang-format has been updated. - (merge fc7e03aace mo/clang-format-for-each-update later to maint). * "git branch --list" learned to show branches that are checked out in other worktrees connected to the same repository prefixed with @@ -280,48 +257,38 @@ Fixes since v2.22 * Code restructuring during 2.20 period broke fetching tags via "import" based transports. - (merge f80d922355 fc/fetch-with-import-fix later to maint). * The commit-graph file is now part of the "files that the runtime may keep open file descriptors on, all of which would need to be closed when done with the object store", and the file descriptor to an existing commit-graph file now is closed before "gc" finalizes a new instance to replace it. - (merge 2d511cfc0b ds/close-object-store later to maint). * "git checkout -p" needs to selectively apply a patch in reverse, which did not work well. - (merge 2bd69b9024 pw/add-p-recount later to maint). * Code clean-up to avoid signed integer wraparounds during binary search. - (merge 568a05c5ec rs/avoid-overflow-in-midpoint-computation later to maint). * "git interpret-trailers" always treated '#' as the comment character, regardless of core.commentChar setting, which has been corrected. - (merge 29c83fc23f jk/trailers-use-config later to maint). * "git stash show 23" used to work, but no more after getting rewritten in C; this regression has been corrected. - (merge 63b50c8ffe tg/stash-ref-by-index-fix later to maint). * "git rebase --abort" used to leave refs/rewritten/ when concluding "git rebase -r", which has been corrected. - (merge d559f502c5 pw/rebase-abort-clean-rewritten later to maint). * An incorrect list of options was cached after command line completion failed (e.g. trying to complete a command that requires a repository outside one), which has been corrected. - (merge 69702523af nd/completion-no-cache-failure later to maint). * The code to parse scaled numbers out of configuration files has been made more robust and also easier to follow. - (merge 39c575c969 rs/config-unit-parsing later to maint). * The codepath to compute delta islands used to spew progress output without giving the callers any way to squelch it, which has been fixed. - (merge bdbdf42f8a jk/delta-islands-progress-fix later to maint). * Protocol capabilities that go over wire should never be translated, but it was incorrectly marked for translation, which has been @@ -330,23 +297,19 @@ Fixes since v2.22 * Use "Erase in Line" CSI sequence that is already used in the editor support to clear cruft in the progress output. - (merge 5b12e3123b sg/rebase-progress later to maint). * "git submodule foreach" did not protect command line options passed to the command to be run in each submodule correctly, when the "--recursive" option was in use. - (merge 30db18b148 ms/submodule-foreach-fix later to maint). * The configuration variable rebase.rescheduleFailedExec should be effective only while running an interactive rebase and should not - affect anything when running an non-interactive one, which was not + affect anything when running a non-interactive one, which was not the case. This has been corrected. - (merge 906b63942a js/rebase-reschedule-applies-only-to-interactive later to maint). * The "git clone" documentation refers to command line options in its description in the short form; they have been replaced with long forms to make them more recognisable. - (merge bfc8c84ed5 qn/clone-doc-use-long-form later to maint). * Generation of pack bitmaps are now disabled when .keep files exist, as these are mutually exclusive features. @@ -355,56 +318,31 @@ Fixes since v2.22 * "git rm" to resolve a conflicted path leaked an internal message "needs merge" before actually removing the path, which was confusing. This has been corrected. - (merge b2b1f615ce jc/denoise-rm-to-resolve later to maint). * "git stash --keep-index" did not work correctly on paths that have been removed, which has been fixed. (merge b932f6a5e8 tg/stash-keep-index-with-removed-paths later to maint). * Window 7 update ;-) - (merge eb7c786314 js/mingw-spawn-with-spaces-in-path later to maint). * A codepath that reads from GPG for signed object verification read past the end of allocated buffer, which has been fixed. - (merge 64c45dc72e sr/gpg-interface-stop-at-the-end later to maint). * "git clean" silently skipped a path when it cannot lstat() it; now it gives a warning. - (merge b09364c47a js/clean-report-too-long-a-path later to maint). * "git push --atomic" that goes over the transport-helper (namely, the smart http transport) failed to prevent refs to be pushed when it can locally tell that one of the ref update will fail without having to consult the other end, which has been corrected. - (merge 2581ea3d31 es/local-atomic-push-failure-with-http later to maint). * The internal diff machinery can be made to read out of bounds while - looking for --funcion-context line in a corner case, which has been + looking for --function-context line in a corner case, which has been corrected. (merge b777f3fd61 jk/xdiff-clamp-funcname-context-index later to maint). * Other code cleanup, docfix, build fix, etc. - (merge f547101b26 es/git-debugger-doc later to maint). - (merge 7877ac3d7b js/bisect-helper-check-get-oid-return-value later to maint). - (merge 0108f47eb3 sw/git-p4-unshelve-branched-files later to maint). - (merge 9df8f734fd cm/send-email-document-req-modules later to maint). - (merge afc3bf6eb1 ab/hash-object-doc later to maint). - (merge 1fde99cfc7 po/doc-branch later to maint). - (merge 459842e1c2 dl/config-alias-doc later to maint). - (merge 5d137fc2c7 cb/fsmonitor-intfix later to maint). - (merge 921d49be86 rs/copy-array later to maint). - (merge cc8d872e69 js/t3404-typofix later to maint). - (merge 729a9b558b cb/mkstemps-uint-type-fix later to maint). - (merge 9dae4fe79f js/gcc-8-and-9 later to maint). - (merge ed33bd8f30 js/t0001-case-insensitive later to maint). - (merge dfa880e336 jw/gitweb-sample-update later to maint). - (merge e532a90a9f sg/t5551-fetch-smart-error-is-translated later to maint). - (merge 8d45ad8c29 jt/t5551-test-chunked later to maint). - (merge 1a64e07d23 sg/git-C-empty-doc later to maint). - (merge 37a2e35395 sg/ci-brew-gcc-workaround later to maint). - (merge 24df0d49c4 js/trace2-signo-typofix later to maint). (merge fbec05c210 cc/test-oidmap later to maint). - (merge 7926cee904 di/readme-markup-fix later to maint). - (merge 02638d1e11 vn/xmmap-gently later to maint). - (merge f7bf24d4dd rm/gpg-program-doc-fix later to maint). - (merge 3aef54e8b8 js/unmap-before-ext-diff later to maint). + (merge 7a06fb038c jk/no-system-includes-in-dot-c later to maint). + (merge 81ed2b405c cb/xdiff-no-system-includes-in-dot-c later to maint). + (merge d61e6ce1dd sg/fsck-config-in-doc later to maint). diff --git a/Documentation/config/log.txt b/Documentation/config/log.txt index 7798e10cb0..e9e1e397f3 100644 --- a/Documentation/config/log.txt +++ b/Documentation/config/log.txt @@ -41,4 +41,4 @@ log.showSignature:: log.mailmap:: If true, makes linkgit:git-log[1], linkgit:git-show[1], and linkgit:git-whatchanged[1] assume `--use-mailmap`, otherwise - assume `--no-use-mailmap`. False by default. + assume `--no-use-mailmap`. True by default. diff --git a/Documentation/config/transfer.txt b/Documentation/config/transfer.txt index 4a5dfe2fc1..f5b6245270 100644 --- a/Documentation/config/transfer.txt +++ b/Documentation/config/transfer.txt @@ -17,7 +17,7 @@ linkgit:git-receive-pack[1]. On the fetch side, malformed objects will instead be left unreferenced in the repository. + Due to the non-quarantine nature of the `fetch.fsckObjects` -implementation it can not be relied upon to leave the object store +implementation it cannot be relied upon to leave the object store clean like `receive.fsckObjects` can. + As objects are unpacked they're written to the object store, so there diff --git a/Documentation/git-cvsserver.txt b/Documentation/git-cvsserver.txt index f98b7c6ed7..79e22b1f3a 100644 --- a/Documentation/git-cvsserver.txt +++ b/Documentation/git-cvsserver.txt @@ -232,7 +232,7 @@ write so it might not be enough to grant the users using 'git-cvsserver' write access to the database file without granting them write access to the directory, too. -The database can not be reliably regenerated in a +The database cannot be reliably regenerated in a consistent form after the branch it is tracking has changed. Example: For merged branches, 'git-cvsserver' only tracks one branch of development, and after a 'git merge' an diff --git a/Documentation/git-fetch.txt b/Documentation/git-fetch.txt index 266d63cf11..5b1909fdf4 100644 --- a/Documentation/git-fetch.txt +++ b/Documentation/git-fetch.txt @@ -262,7 +262,7 @@ This updates (or creates, as necessary) branches `pu` and `tmp` in the local repository by fetching from the branches (respectively) `pu` and `maint` from the remote repository. + -The `pu` branch will be updated even if it is does not fast-forward, +The `pu` branch will be updated even if it does not fast-forward, because it is prefixed with a plus sign; `tmp` will not be. * Peek at a remote's branch, without configuring the remote in your local @@ -285,7 +285,7 @@ BUGS ---- Using --recurse-submodules can only fetch new commits in already checked out submodules right now. When e.g. upstream added a new submodule in the -just fetched commits of the superproject the submodule itself can not be +just fetched commits of the superproject the submodule itself cannot be fetched, making it impossible to check out that submodule later without having to do a fetch again. This is expected to be fixed in a future Git version. diff --git a/Documentation/git-fsck.txt b/Documentation/git-fsck.txt index e0eae642c1..d72d15be5b 100644 --- a/Documentation/git-fsck.txt +++ b/Documentation/git-fsck.txt @@ -104,6 +104,11 @@ care about this output and want to speed it up further. progress status even if the standard error stream is not directed to a terminal. +CONFIGURATION +------------- + +include::config/fsck.txt[] + DISCUSSION ---------- diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index a5e9501a0a..dfb901f8b8 100644 --- a/Documentation/git-pull.txt +++ b/Documentation/git-pull.txt @@ -249,7 +249,7 @@ BUGS ---- Using --recurse-submodules can only fetch new commits in already checked out submodules right now. When e.g. upstream added a new submodule in the -just fetched commits of the superproject the submodule itself can not be +just fetched commits of the superproject the submodule itself cannot be fetched, making it impossible to check out that submodule later without having to do a fetch again. This is expected to be fixed in a future Git version. diff --git a/Documentation/git-restore.txt b/Documentation/git-restore.txt index d90093f195..1ab2e40ea9 100644 --- a/Documentation/git-restore.txt +++ b/Documentation/git-restore.txt @@ -39,7 +39,7 @@ OPTIONS commit, branch or tag associated with it. + If not specified, the default restore source for the working tree is -the index, and the default restore source for the index index is +the index, and the default restore source for the index is `HEAD`. When both `--staged` and `--worktree` are specified, `--source` must also be specified. diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt index 8d38ae6010..090c888335 100644 --- a/Documentation/glossary-content.txt +++ b/Documentation/glossary-content.txt @@ -255,7 +255,7 @@ This commit is referred to as a "merge commit", or sometimes just a [[def_object]]object:: The unit of storage in Git. It is uniquely identified by the <<def_SHA1,SHA-1>> of its contents. Consequently, an - object can not be changed. + object cannot be changed. [[def_object_database]]object database:: Stores a set of "objects", and an individual <<def_object,object>> is diff --git a/Documentation/technical/api-ref-iteration.txt b/Documentation/technical/api-ref-iteration.txt index 46c3d5c355..ad9d019ff9 100644 --- a/Documentation/technical/api-ref-iteration.txt +++ b/Documentation/technical/api-ref-iteration.txt @@ -54,7 +54,7 @@ this: do not do this you will get an error for each ref that it does not point to a valid object. -Note: As a side-effect of this you can not safely assume that all +Note: As a side-effect of this you cannot safely assume that all objects you lookup are available in superproject. All submodule objects will be available the same way as the superprojects objects. |