diff options
author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2017-04-19 09:22:03 +0000 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-04-19 18:53:06 -0700 |
commit | f17d642d3b0fa64879d59b311e596949f2a1f6d2 (patch) | |
tree | df003ca2ee3da78cd623fb4baef92a7a2934c3d5 /Documentation/diff-heuristic-options.txt | |
parent | Prepare for 2.12.3 (diff) | |
download | tgif-f17d642d3b0fa64879d59b311e596949f2a1f6d2.tar.xz |
push: document & test --force-with-lease with multiple remotes
Document & test for cases where there are two remotes pointing to the
same URL, and a background fetch & subsequent `git push
--force-with-lease` shouldn't clobber un-updated references we haven't
fetched.
Some editors like Microsoft's VSC have a feature to auto-fetch in the
background, this bypasses the protections offered by
--force-with-lease & --force-with-lease=<refname>, as noted in the
documentation being added here.
See the 'Tools that do an automatic fetch defeat "git push
--force-with-lease"' (<1491617750.2149.10.camel@mattmccutchen.net>)
git mailing list thread for more details. Jakub Narębski suggested
this method of adding another remote to bypass this edge case,
document that & add a test for it.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/diff-heuristic-options.txt')
0 files changed, 0 insertions, 0 deletions