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 /remote.h | |
parent | f59c6e6ccb1386f0fdde2753f62536dfd3343118 (diff) | |
parent | 9eed4f3711a605ab2d9b986357879a09a6d54f36 (diff) | |
download | git-f34d900aa7346592a9d7fd2eb7b21126fd9732d5.tar.gz |
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 'remote.h')
-rw-r--r-- | remote.h | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -89,7 +89,6 @@ struct ref { force:1, forced_update:1, expect_old_sha1:1, - expect_old_no_trackback:1, deletion:1, matched:1; |