diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-09-29 16:57:13 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-09-29 16:57:13 -0700 |
| commit | 938c2a63212847bf87fc2a7076ccd4e15dfa3955 (patch) | |
| tree | 210b729986409032610fe25f3d30b7d03cc623ce /Documentation/git-merge.txt | |
| parent | Merge branch 'jk/verify-packfile-gently' (diff) | |
| parent | fetch-pack: do not reset in_vain on non-novel acks (diff) | |
| download | tgif-938c2a63212847bf87fc2a7076ccd4e15dfa3955.tar.xz | |
Merge branch 'jt/fetch-pack-in-vain-count-with-stateless'
When "git fetch" tries to find where the history of the repository
it runs in has diverged from what the other side has, it has a
mechanism to avoid digging too deep into irrelevant side branches.
This however did not work well over the "smart-http" transport due
to a design bug, which has been fixed.
* jt/fetch-pack-in-vain-count-with-stateless:
fetch-pack: do not reset in_vain on non-novel acks
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions