summaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-12-28 22:08:45 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-12-28 22:08:45 (GMT)
commit5abbdbbd9bd32aaae0e11d078b0151f7a7e3d20d (patch)
tree41a12d0f47ebf86c91492097bf7a3ef05d4db0ec /diff.c
parent1f24cad852cdfad871182e53a2b7f7d392ac7c66 (diff)
parent041fe8fc83770f95b09db4aa9d9b3783789eab08 (diff)
downloadgit-5abbdbbd9bd32aaae0e11d078b0151f7a7e3d20d.zip
git-5abbdbbd9bd32aaae0e11d078b0151f7a7e3d20d.tar.gz
git-5abbdbbd9bd32aaae0e11d078b0151f7a7e3d20d.tar.bz2
Merge branch 'ra/prompt-eread-fix'
Update the shell prompt script (in contrib/) to strip trailing CR from strings read from various "state" files. * ra/prompt-eread-fix: git-prompt: fix reading files with windows line endings git-prompt: make __git_eread intended use explicit
Diffstat (limited to 'diff.c')
0 files changed, 0 insertions, 0 deletions