diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-03-25 14:01:02 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-03-25 14:01:03 -0700 |
| commit | 62bd0c01057b1cc47f4710090da4c84511f3cc3d (patch) | |
| tree | a188a091111f84b0550d9340abbd2cc6e540fe97 /builtin/merge-ours.c | |
| parent | Merge branch 'lf/setup-prefix-pathspec' (diff) | |
| parent | upload-pack: load non-tip "want" objects from disk (diff) | |
| download | tgif-62bd0c01057b1cc47f4710090da4c84511f3cc3d.tar.xz | |
Merge branch 'jk/peel-ref'
Recent optimization broke shallow clones.
* jk/peel-ref:
upload-pack: load non-tip "want" objects from disk
upload-pack: make sure "want" objects are parsed
upload-pack: drop lookup-before-parse optimization
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions