aboutsummaryrefslogtreecommitdiff
path: root/resolve-undo.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-06-27 14:37:41 -0700
committerJunio C Hamano <gitster@pobox.com>2013-06-27 14:37:41 -0700
commit0fb2c97c206958a13e8979187b7b3cc31d389126 (patch)
tree83687d7743812157c37fd644127ba47844f441f3 /resolve-undo.h
parent11fbc0b1e1d5435f482af7bf391fd0d679955ba6 (diff)
parent71d5f938910120275484aac0b2e1c27cdf8b5cf3 (diff)
downloadgit-0fb2c97c206958a13e8979187b7b3cc31d389126.tar.gz
git-0fb2c97c206958a13e8979187b7b3cc31d389126.tar.xz
Merge branch 'mh/fetch-into-shallow' into maint
* 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 'resolve-undo.h')
0 files changed, 0 insertions, 0 deletions