diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-11-21 20:39:02 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-21 20:39:02 +0900 |
| commit | cdda0ccebfaba45d6e157f9fa205a82aa563c44a (patch) | |
| tree | ae5c1b3ef937fa0589029cf4b6aeb5c4274b68d5 /Documentation/git-merge.txt | |
| parent | Merge branch 'cc/delta-islands' (diff) | |
| parent | index: make index.threads=true enable ieot and eoie (diff) | |
| download | tgif-cdda0ccebfaba45d6e157f9fa205a82aa563c44a.tar.xz | |
Merge branch 'jn/eoie-ieot'
As the warning message shown by existing versions of Git for
unknown index extensions is a bit too alarming, two new extensions
are held back and not written by default for the upcoming release.
* jn/eoie-ieot:
index: make index.threads=true enable ieot and eoie
ieot: default to not writing IEOT section
eoie: default to not writing EOIE section
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions