diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-01-14 12:34:01 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-01-14 12:34:01 -0800 |
| commit | e1ef7d177c3fcfdd25df9c4b67d36012bedebd74 (patch) | |
| tree | 0035d368a857b7c7614b498c645ac1aa7a059fd0 /builtin/merge-file.c | |
| parent | Merge branch 'mm/complete-rebase-autostash' (diff) | |
| parent | git-prompt.sh: allow to hide prompt for ignored pwd (diff) | |
| download | tgif-e1ef7d177c3fcfdd25df9c4b67d36012bedebd74.tar.xz | |
Merge branch 'rh/hide-prompt-in-ignored-directory'
* rh/hide-prompt-in-ignored-directory:
git-prompt.sh: allow to hide prompt for ignored pwd
git-prompt.sh: if pc mode, immediately set PS1 to a plain prompt
Diffstat (limited to 'builtin/merge-file.c')
0 files changed, 0 insertions, 0 deletions