summaryrefslogtreecommitdiff
path: root/preload-index.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-06-05 12:00:06 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-06-05 12:00:06 -0700
commit1d93ec93970d73e57c37dffd2108dbd01761cb2c (patch)
treeb897f303b65e014e839bd51c1edec20a266ee073 /preload-index.c
parentMerge branch 'jc/plug-fmt-merge-msg-leak' into maint (diff)
parentblame: CRLF in the working tree and LF in the repo (diff)
downloadtgif-1d93ec93970d73e57c37dffd2108dbd01761cb2c.tar.xz
Merge branch 'tb/blame-resurrect-convert-to-git' into maint
Some time ago, "git blame" (incorrectly) lost the convert_to_git() call when synthesizing a fake "tip" commit that represents the state in the working tree, which broke folks who record the history with LF line ending to make their project portabile across platforms while terminating lines in their working tree files with CRLF for their platform. * tb/blame-resurrect-convert-to-git: blame: CRLF in the working tree and LF in the repo
Diffstat (limited to 'preload-index.c')
0 files changed, 0 insertions, 0 deletions