diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-07-23 20:55:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-23 20:55:21 -0700 |
| commit | 30ea575876f61c38c59cd578afd8e8789857094b (patch) | |
| tree | 581da17bd126cf8f6dc45325a80551c4818622ab /Documentation/git-merge-file.txt | |
| parent | Merge branch 'nk/maint-gitweb-log-by-lines' (diff) | |
| parent | Strip namelen out of ce_flags into a ce_namelen field (diff) | |
| download | tgif-30ea575876f61c38c59cd578afd8e8789857094b.tar.xz | |
Merge branch 'tg/ce-namelen-field'
Split lower bits of ce_flags field and creates a new ce_namelen
field in the in-core index structure.
* tg/ce-namelen-field:
Strip namelen out of ce_flags into a ce_namelen field
Diffstat (limited to 'Documentation/git-merge-file.txt')
0 files changed, 0 insertions, 0 deletions