summaryrefslogtreecommitdiffstats
path: root/git-push.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-08-10 13:46:26 -0700
committerJunio C Hamano <gitster@pobox.com>2016-08-10 13:46:26 -0700
commitaf182946f079a91cbb0a29e282aa9c23db0f0456 (patch)
treec1ab2efc38807569439e941c3d95a27d0ddb5fd2 /git-push.txt
parente548d1b2c1b0ecaf83038da7b3098aa3c9466c0c (diff)
downloadgit-htmldocs-af182946f079a91cbb0a29e282aa9c23db0f0456.tar.gz
Autogenerated HTML docs for v2.9.2-729-ga42d7
Diffstat (limited to 'git-push.txt')
-rw-r--r--git-push.txt5
1 files changed, 3 insertions, 2 deletions
diff --git a/git-push.txt b/git-push.txt
index ec514f6cd..47b77e693 100644
--- a/git-push.txt
+++ b/git-push.txt
@@ -204,10 +204,11 @@ branch we have for it.
+
`--force-with-lease=<refname>:<expect>` will protect the named ref (alone),
if it is going to be updated, by requiring its current value to be
-the same as the specified value <expect> (which is allowed to be
+the same as the specified value `<expect>` (which is allowed to be
different from the remote-tracking branch we have for the refname,
or we do not even have to have such a remote-tracking branch when
-this form is used).
+this form is used). If `<expect>` is the empty string, then the named ref
+must not already exist.
+
Note that all forms other than `--force-with-lease=<refname>:<expect>`
that specifies the expected current value of the ref explicitly are