diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-12-13 22:03:36 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-13 22:03:36 -0800 |
| commit | 68f80f549092bcbb2409ba9c0eace73c085ba7cc (patch) | |
| tree | cfa6bb8d0528b9fb4bc70e1f28ac178a89b28812 /Documentation/merge-strategies.txt | |
| parent | Merge branch 'mf/curl-select-fdset' into maint (diff) | |
| parent | receive-pack, fetch-pack: reject bogus pack that records objects twice (diff) | |
| download | tgif-68f80f549092bcbb2409ba9c0eace73c085ba7cc.tar.xz | |
Merge branch 'jc/index-pack-reject-dups' into maint
* jc/index-pack-reject-dups:
receive-pack, fetch-pack: reject bogus pack that records objects twice
Diffstat (limited to 'Documentation/merge-strategies.txt')
0 files changed, 0 insertions, 0 deletions