]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'jk/push-force-with-lease-creation'
authorJunio C Hamano <gitster@pobox.com>
Wed, 10 Aug 2016 19:33:18 +0000 (12:33 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 10 Aug 2016 19:33:18 +0000 (12:33 -0700)
commite6747627865347a534e7106bb1d14e32867b234d
treee1d42d0b487628340329a4bf0e5333b477b149c3
parent24fbe004904f95ea07f22fea4e4c02a632149d73
parent9eed4f3711a605ab2d9b986357879a09a6d54f36
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
Documentation/git-push.txt
remote.c
remote.h