diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-12-08 14:05:02 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-12-08 14:05:02 -0800 |
| commit | e6ed5a438c7a5436a08c08e269174d9975f8dc1d (patch) | |
| tree | 52abb467a39f163dbb103c2e0ca47da4d5320e9b /mergetools/gvimdiff | |
| parent | Merge branch 'jk/interpret-trailers-outside-a-repository' into maint (diff) | |
| parent | bash prompt: indicate dirty index even on orphan branches (diff) | |
| download | tgif-e6ed5a438c7a5436a08c08e269174d9975f8dc1d.tar.xz | |
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
Diffstat (limited to 'mergetools/gvimdiff')
0 files changed, 0 insertions, 0 deletions