diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-05-29 14:20:30 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-05-29 14:20:30 -0700 |
| commit | 305e19bdc315f302b935d50abff4a1a405e14b71 (patch) | |
| tree | f835988777eb607a80e3d6c858829c65ec2d94ad /Documentation/merge-config.txt | |
| parent | Merge branch 'js/transport-helper-error-reporting-fix' (diff) | |
| parent | t5500: add test for fetching with an unknown 'shallow' (diff) | |
| download | tgif-305e19bdc315f302b935d50abff4a1a405e14b71.tar.xz | |
Merge branch 'mh/fetch-into-shallow'
"git fetch" into a shallow repository from a repository that does
not know about the shallow boundary commits (e.g. a different fork
from the repository the current shallow repository was cloned from)
did not work correctly.
* mh/fetch-into-shallow:
t5500: add test for fetching with an unknown 'shallow'
upload-pack: ignore 'shallow' lines with unknown obj-ids
Diffstat (limited to 'Documentation/merge-config.txt')
0 files changed, 0 insertions, 0 deletions