diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-07-10 13:58:56 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-07-10 13:58:56 -0700 |
commit | 86d51bbe1aacc7574241a33c3667581640a23841 (patch) | |
tree | 316e78aab46ac3baa6c758aed9743e2ab90b3dad /Documentation/gitworkflows.txt | |
parent | Merge branch 'da/mergetools-meld-output-opt-on-macos' into maint (diff) | |
parent | doc: do not use `rm .git/index` when normalizing line endings (diff) | |
download | tgif-86d51bbe1aacc7574241a33c3667581640a23841.tar.xz |
Merge branch 'ah/doc-gitattributes-empty-index' into maint
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 'Documentation/gitworkflows.txt')
0 files changed, 0 insertions, 0 deletions