diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-10-26 16:08:00 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-26 16:08:00 -0700 |
| commit | eb4e67288bb9d66fb46092fa30d72c4bdded0c2a (patch) | |
| tree | ca6ac1501f7dd8de09fabe58072b5629445ff68c /builtin/merge-file.c | |
| parent | make the sample pre-commit hook script reject names with newlines, too (diff) | |
| parent | Documentation/git-update-index: refer to 'ls-files' (diff) | |
| download | tgif-eb4e67288bb9d66fb46092fa30d72c4bdded0c2a.tar.xz | |
Merge branch 'sn/doc-update-index-assume-unchanged' into maint-1.7.3
* sn/doc-update-index-assume-unchanged:
Documentation/git-update-index: refer to 'ls-files'
Diffstat (limited to 'builtin/merge-file.c')
0 files changed, 0 insertions, 0 deletions