| commit | 80c17cac368c8acf47d5b79b4f5e40d4018efa42 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 4 Dec 2015 19:19:12 +0000 (4 11:19 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 4 Dec 2015 19:19:12 +0000 (4 11:19 -0800) | ||
| tree | 894b02474453dd67b3f03ba667afdeb72c35f69d | treesnapshot (tar.gz zip) |
| parent | 3a5b6eeceb8ea149ec8c0139f64683942e62722b | commitdiff |
| parent | c26f70ceb3960603a78010c87f8ad11820ab6561 | commitdiff |
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
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