From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 8 Dec 2015 22:05:02 +0000 (-0800)
Subject: Merge branch 'sg/bash-prompt-dirty-orphan' into maint
X-Git-Tag: v2.6.4~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e6ed5a438c7a5436a08c08e269174d9975f8dc1d;p=thirdparty%2Fgit.git

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

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

e6ed5a438c7a5436a08c08e269174d9975f8dc1d