]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 22386ad c26f70c)
Merge branch 'sg/bash-prompt-dirty-orphan' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 8 Dec 2015 22:05:02 +0000 (14:05 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 8 Dec 2015 22:05:02 +0000 (14:05 -0800)
commite6ed5a438c7a5436a08c08e269174d9975f8dc1d
tree52abb467a39f163dbb103c2e0ca47da4d5320e9btree | snapshot
parent22386ad6ee427453588936f872d6e0d8dd6cf751commit | diff
parentc26f70ceb3960603a78010c87f8ad11820ab6561commit | diff
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
Unnamed repository; edit this file 'description' to name the repository.