t, doc: update tests, reference for "--force-if-includes"
authorSrinidhi Kaushik <shrinidhi.kaushik@gmail.com>
Sat, 3 Oct 2020 12:10:46 +0000 (17:40 +0530)
committerJunio C Hamano <gitster@pobox.com>
Sat, 3 Oct 2020 16:59:19 +0000 (09:59 -0700)
commit3b5bf96573b5773e64f7884607794c268b352992
tree88ae77c7437a97769fa198d1e23f28942c412e48
parent3b990aa645d1169b7373d12cbf1511ca4633e349
t, doc: update tests, reference for "--force-if-includes"

Update test cases for the new option, and document its usage
and update related references.

Update test cases for the new option, and document its usage
and update related references.

 - t/t5533-push-cas.sh:
   Update test cases for "compare-and-swap" when used along with
   "--force-if-includes" helps mitigate overwrites when remote
   refs are updated in the background; allows forced updates when
   changes from remote are integrated locally.

 - Documentation:
   Add reference for the new option, configuration setting
   ("push.useForceIfIncludes") and advise messages.

Signed-off-by: Srinidhi Kaushik <shrinidhi.kaushik@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/config/advice.txt
Documentation/config/push.txt
Documentation/git-push.txt
t/t5533-push-cas.sh