From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 27 Oct 2020 22:09:49 +0000 (-0700)
Subject: Merge branch 'sk/force-if-includes'
X-Git-Tag: v2.30.0-rc0~153
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=de0a7effc86aadf6177fdcea52b5ae24c7a85911;p=thirdparty%2Fgit.git

Merge branch 'sk/force-if-includes'

"git push --force-with-lease[=<ref>]" can easily be misused to lose
commits unless the user takes good care of their own "git fetch".
A new option "--force-if-includes" attempts to ensure that what is
being force-pushed was created after examining the commit at the
tip of the remote ref that is about to be force-replaced.

* sk/force-if-includes:
  t, doc: update tests, reference for "--force-if-includes"
  push: parse and set flag for "--force-if-includes"
  push: add reflog check for "--force-if-includes"
---

de0a7effc86aadf6177fdcea52b5ae24c7a85911