From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 4 Dec 2015 19:19:12 +0000 (-0800)
Subject: Merge branch 'sg/bash-prompt-dirty-orphan'
X-Git-Tag: v2.7.0-rc0~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=80c17cac368c8acf47d5b79b4f5e40d4018efa42;p=thirdparty%2Fgit.git

Merge branch 'sg/bash-prompt-dirty-orphan'

Produce correct "dirty" marker for shell prompts, even when we
are on an orphan or an unborn branch.

* sg/bash-prompt-dirty-orphan:
  bash prompt: indicate dirty index even on orphan branches
  bash prompt: remove a redundant 'git diff' option
  bash prompt: test dirty index and worktree while on an orphan branch
---

80c17cac368c8acf47d5b79b4f5e40d4018efa42