Merge branch 'en/merge-recursive-directory-rename-fixes'

[thirdparty/git.git] / Documentation / gitremote-helpers.txt

diff --git a/Documentation/gitremote-helpers.txt b/Documentation/gitremote-helpers.txt
index a5c3c04371205e0a3694d403b934ab43eacea0f7..f48a031dc346a307aa33aebc62686709a18673f6 100644 (file)
--- 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.
 
        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]
 SEE ALSO
 --------
 linkgit:git-remote[1]