summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Jiang Xin <worldhello.net@gmail.com>2019-10-28 13:18:55 +0800
committerLibravatar Jiang Xin <worldhello.net@gmail.com>2019-10-28 13:18:55 +0800
commit468d356a811f527501bd408c97f5c12333b8bfe3 (patch)
treefd71542752e92600f28c63fa309f864c85989359 /Documentation
parentl10n: it.po: update the Italian translation for Git 2.24.0 (diff)
parentGit 2.24-rc1 (diff)
downloadtgif-468d356a811f527501bd408c97f5c12333b8bfe3.tar.xz
Merge tag 'v2.24.0-rc1' of github.com:git/git into master
Git 2.24-rc1 * tag 'v2.24.0-rc1' of github.com:git/git: Git 2.24-rc1 repo-settings: read an int for index.version ci: fix GCC install in the Travis CI GCC OSX job Eleventh batch ci(osx): use new location of the `perforce` cask t7419: change test_must_fail to ! for grep t4014: make output-directory tests self-contained ci(visual-studio): actually run the tests in parallel ci(visual-studio): use strict compile flags, and optimization userdiff: fix some corner cases in dts regex test-progress: fix test failures on big-endian systems completion: clarify installation instruction for zsh grep: avoid leak of chartables in PCRE2 grep: make PCRE2 aware of custom allocator grep: make PCRE1 aware of custom allocator remote-curl: pass on atomic capability to remote side diff-highlight: fix a whitespace nit fsmonitor: don't fill bitmap with entries to be removed
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/RelNotes/2.24.0.txt10
-rw-r--r--Documentation/gitremote-helpers.txt5
2 files changed, 15 insertions, 0 deletions
diff --git a/Documentation/RelNotes/2.24.0.txt b/Documentation/RelNotes/2.24.0.txt
index 4b442a9157..125169d0da 100644
--- a/Documentation/RelNotes/2.24.0.txt
+++ b/Documentation/RelNotes/2.24.0.txt
@@ -75,6 +75,9 @@ UI, Workflows & Features
submodules, but this did not apply to "git fetch --multiple" that
fetches from multiple remote repositories. It now does.
+ * The installation instruction for zsh completion script (in
+ contrib/) has been a bit improved.
+
Performance, Internal Implementation, Development Support etc.
@@ -337,6 +340,10 @@ Fixes since v2.23
corrected.
(merge 556895d0c8 jj/stash-reset-only-toplevel later to maint).
+ * The atomic push over smart HTTP transport did not work, which has
+ been corrected.
+ (merge 6f1194246a bc/smart-http-atomic-push later to maint).
+
* Other code cleanup, docfix, build fix, etc.
(merge d1387d3895 en/fast-import-merge-doc later to maint).
(merge 1c24a54ea4 bm/repository-layout-typofix later to maint).
@@ -385,3 +392,6 @@ Fixes since v2.23
(merge 5cc6a4be11 rs/http-push-simplify later to maint).
(merge a81e42d235 rs/column-use-utf8-strnwidth later to maint).
(merge 062a309d36 rs/remote-curl-use-argv-array later to maint).
+ (merge 3b3c79f6c9 nr/diff-highlight-indent-fix later to maint).
+ (merge 3444ec2eb2 wb/fsmonitor-bitmap-fix later to maint).
+ (merge 10da030ab7 cb/pcre2-chartables-leakfix later to maint).
diff --git a/Documentation/gitremote-helpers.txt b/Documentation/gitremote-helpers.txt
index a5c3c04371..f48a031dc3 100644
--- a/Documentation/gitremote-helpers.txt
+++ b/Documentation/gitremote-helpers.txt
@@ -509,6 +509,11 @@ set by Git if the remote helper has the 'option' capability.
Indicate that only the objects wanted need to be fetched, not
their dependents.
+'option atomic' {'true'|'false'}::
+ When pushing, request the remote server to update refs in a single atomic
+ transaction. If successful, all refs will be updated, or none will. If the
+ remote side does not support this capability, the push will fail.
+
SEE ALSO
--------
linkgit:git-remote[1]