path: root/Documentation/git-push.txt
diff options
authorJunio C Hamano <>2016-08-10 19:33:18 (GMT)
committerJunio C Hamano <>2016-08-10 19:33:18 (GMT)
commite6747627865347a534e7106bb1d14e32867b234d (patch)
treee1d42d0b487628340329a4bf0e5333b477b149c3 /Documentation/git-push.txt
parent24fbe004904f95ea07f22fea4e4c02a632149d73 (diff)
parent9eed4f3711a605ab2d9b986357879a09a6d54f36 (diff)
Merge branch 'jk/push-force-with-lease-creation'
"git push --force-with-lease" already had enough logic to allow ensuring that such a push results in creation of a ref (i.e. the receiving end did not have another push from sideways that would be discarded by our force-pushing), but didn't expose this possibility to the users. It does so now. * jk/push-force-with-lease-creation: t5533: make it pass on case-sensitive filesystems push: allow pushing new branches with --force-with-lease push: add shorthand for --force-with-lease branch creation Documentation/git-push: fix placeholder formatting
Diffstat (limited to 'Documentation/git-push.txt')
1 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
index ec514f6..47b77e6 100644
--- a/Documentation/git-push.txt
+++ b/Documentation/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