diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-06-24 14:28:37 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-06-24 14:28:37 -0700 |
commit | 2bc81f2a83601ddfaad7d38406f819682f9cb756 (patch) | |
tree | 19e6fd3bb72f1abd3291826a974998fc27792e5c /t/t5515-fetch-merge-logic.sh | |
parent | Merge branch 'ab/wildmatch-glob-slash-test' (diff) | |
parent | doc: do not use `rm .git/index` when normalizing line endings (diff) | |
download | tgif-2bc81f2a83601ddfaad7d38406f819682f9cb756.tar.xz |
Merge branch 'ah/doc-gitattributes-empty-index'
An example in documentation that does not work in multi worktree
configuration has been corrected.
* ah/doc-gitattributes-empty-index:
doc: do not use `rm .git/index` when normalizing line endings
Diffstat (limited to 't/t5515-fetch-merge-logic.sh')
0 files changed, 0 insertions, 0 deletions