diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-08-10 12:33:18 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-08-10 12:33:18 -0700 |
commit | e6747627865347a534e7106bb1d14e32867b234d (patch) | |
tree | e1d42d0b487628340329a4bf0e5333b477b149c3 /remote.h | |
parent | Merge branch 'jk/reset-ident-time-per-commit' (diff) | |
parent | t5533: make it pass on case-sensitive filesystems (diff) | |
download | tgif-e6747627865347a534e7106bb1d14e32867b234d.tar.xz |
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 '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; |