tree 4c542ec9c7c2b29ad2d1c1329602bc47dc40c4c5
parent 52b8c8c7165987650bf873b878f20b14c33b268f
parent 3b5bf96573b5773e64f7884607794c268b352992
author Junio C Hamano <gitster@pobox.com> 1603836589 -0700
committer Junio C Hamano <gitster@pobox.com> 1603836589 -0700

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"