diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-06-27 09:56:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-06-27 09:56:47 -0700 |
| commit | be099661f41e661eac8af2b4879a84a9eb9a7b9b (patch) | |
| tree | 5ad88ee762575674b547ead40484e80432454772 /mergetools | |
| parent | Merge branch 'sg/reflog-past-root' (diff) | |
| parent | git-prompt.sh: Don't error on null ${ZSH,BASH}_VERSION, $short_sha (diff) | |
| download | tgif-be099661f41e661eac8af2b4879a84a9eb9a7b9b.tar.xz | |
Merge branch 'vs/prompt-avoid-unset-variable'
The git-prompt scriptlet (in contrib/) was not friendly with those
who uses "set -u", which has been fixed.
* vs/prompt-avoid-unset-variable:
git-prompt.sh: Don't error on null ${ZSH,BASH}_VERSION, $short_sha
Diffstat (limited to 'mergetools')
0 files changed, 0 insertions, 0 deletions