diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-09-08 21:35:53 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-09-08 21:35:53 -0700 |
| commit | f34d900aa7346592a9d7fd2eb7b21126fd9732d5 (patch) | |
| tree | bf756b15988b94b1f045a6f53c1eec9c3c479812 /Documentation | |
| parent | Merge branch 'jk/reflog-date' into maint (diff) | |
| parent | t5533: make it pass on case-sensitive filesystems (diff) | |
| download | tgif-f34d900aa7346592a9d7fd2eb7b21126fd9732d5.tar.xz | |
Merge branch 'jk/push-force-with-lease-creation' into maint
"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')
| -rw-r--r-- | Documentation/git-push.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt index 93c3527f0c..927a0341cf 100644 --- a/Documentation/git-push.txt +++ b/Documentation/git-push.txt @@ -198,10 +198,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 |