Merge branch 'ra/prompt-eread-fix'
commit5abbdbbd9bd32aaae0e11d078b0151f7a7e3d20d
authorJunio C Hamano <gitster@pobox.com>
Thu, 28 Dec 2017 22:08:45 +0000 (28 14:08 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 28 Dec 2017 22:08:45 +0000 (28 14:08 -0800)
tree41a12d0f47ebf86c91492097bf7a3ef05d4db0ec
parent1f24cad852cdfad871182e53a2b7f7d392ac7c66
parent041fe8fc83770f95b09db4aa9d9b3783789eab08
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