summaryrefslogtreecommitdiff
path: root/Documentation/gitdiffcore.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-07-10 13:58:56 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-07-10 13:58:56 -0700
commit86d51bbe1aacc7574241a33c3667581640a23841 (patch)
tree316e78aab46ac3baa6c758aed9743e2ab90b3dad /Documentation/gitdiffcore.txt
parentMerge branch 'da/mergetools-meld-output-opt-on-macos' into maint (diff)
parentdoc: do not use `rm .git/index` when normalizing line endings (diff)
downloadtgif-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/gitdiffcore.txt')
0 files changed, 0 insertions, 0 deletions