summaryrefslogtreecommitdiff
path: root/Documentation/gitremote-helpers.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-03-18 20:49:32 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-03-18 20:49:33 (GMT)
commit90e6255a6d01760d13d8ac635cca5819b0b4dbc5 (patch)
treeae04f89b4316b70e09807479c3edd949751c4c20 /Documentation/gitremote-helpers.txt
parentdecba94d2c664229d16ee7c3cc442c0ada6090b9 (diff)
parenta7cb1276cc263446b19b43d3a7784cbc72f84e28 (diff)
downloadgit-90e6255a6d01760d13d8ac635cca5819b0b4dbc5.zip
git-90e6255a6d01760d13d8ac635cca5819b0b4dbc5.tar.gz
git-90e6255a6d01760d13d8ac635cca5819b0b4dbc5.tar.bz2
Merge branch 'fc/transport-helper-fixes'
Updates transport-helper, fast-import and fast-export to allow the ref mapping and ref deletion in a way similar to the natively supported transports. * fc/transport-helper-fixes: remote-bzr: support the new 'force' option test-hg.sh: tests are now expected to pass transport-helper.c: do not overwrite forced bit transport-helper: check for 'forced update' message transport-helper: add 'force' to 'export' helpers transport-helper: don't update refs in dry-run transport-helper: mismerge fix
Diffstat (limited to 'Documentation/gitremote-helpers.txt')
-rw-r--r--Documentation/gitremote-helpers.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/gitremote-helpers.txt b/Documentation/gitremote-helpers.txt
index c2908db..64f7ad2 100644
--- a/Documentation/gitremote-helpers.txt
+++ b/Documentation/gitremote-helpers.txt
@@ -437,6 +437,10 @@ set by Git if the remote helper has the 'option' capability.
'option check-connectivity' \{'true'|'false'\}::
Request the helper to check connectivity of a clone.
+'option force' \{'true'|'false'\}::
+ Request the helper to perform a force update. Defaults to
+ 'false'.
+
'option cloning \{'true'|'false'\}::
Notify the helper this is a clone request (i.e. the current
repository is guaranteed empty).