diff options
| author | Srinidhi Kaushik <shrinidhi.kaushik@gmail.com> | 2020-10-03 12:10:46 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-10-03 16:59:19 (GMT) |
| commit | 3b5bf96573b5773e64f7884607794c268b352992 (patch) | |
| tree | 88ae77c7437a97769fa198d1e23f28942c412e48 /Documentation/config/advice.txt | |
| parent | 3b990aa645d1169b7373d12cbf1511ca4633e349 (diff) | |
| download | git-3b5bf96573b5773e64f7884607794c268b352992.zip git-3b5bf96573b5773e64f7884607794c268b352992.tar.gz git-3b5bf96573b5773e64f7884607794c268b352992.tar.bz2 | |
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>
Diffstat (limited to 'Documentation/config/advice.txt')
| -rw-r--r-- | Documentation/config/advice.txt | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Documentation/config/advice.txt b/Documentation/config/advice.txt index bdd37c3..acbd0c0 100644 --- a/Documentation/config/advice.txt +++ b/Documentation/config/advice.txt @@ -10,9 +10,8 @@ advice.*:: that the check is disabled. pushUpdateRejected:: Set this variable to 'false' if you want to disable - 'pushNonFFCurrent', - 'pushNonFFMatching', 'pushAlreadyExists', - 'pushFetchFirst', and 'pushNeedsForce' + 'pushNonFFCurrent', 'pushNonFFMatching', 'pushAlreadyExists', + 'pushFetchFirst', 'pushNeedsForce', and 'pushRefNeedsUpdate' simultaneously. pushNonFFCurrent:: Advice shown when linkgit:git-push[1] fails due to a @@ -41,6 +40,10 @@ advice.*:: we can still suggest that the user push to either refs/heads/* or refs/tags/* based on the type of the source object. + pushRefNeedsUpdate:: + Shown when linkgit:git-push[1] rejects a forced update of + a branch when its remote-tracking ref has updates that we + do not have locally. statusAheadBehind:: Shown when linkgit:git-status[1] computes the ahead/behind counts for a local ref compared to its remote tracking ref, |