From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 28 Dec 2017 22:08:45 +0000 (-0800)
Subject: Merge branch 'ra/prompt-eread-fix'
X-Git-Tag: v2.16.0-rc0~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5abbdbbd9bd32aaae0e11d078b0151f7a7e3d20d;p=thirdparty%2Fgit.git

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
---

5abbdbbd9bd32aaae0e11d078b0151f7a7e3d20d