diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-12-22 12:28:20 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-12-22 12:28:20 -0800 |
| commit | 35b5a8b76999e3c48c3e01c3fd8559bd447d2dfa (patch) | |
| tree | 0e263409a55575d595da284d824e7bdc44a86ddf /builtin/merge-index.c | |
| parent | Merge branch 'ch/new-gpg-drops-rfc-1991' (diff) | |
| parent | git-prompt.sh: make $f local to __git_eread() (diff) | |
| download | tgif-35b5a8b76999e3c48c3e01c3fd8559bd447d2dfa.tar.xz | |
Merge branch 'jg/prompt-localize-temporary'
"git-prompt" (in contrib/) used a variable from the global scope,
possibly contaminating end-user's namespace.
* jg/prompt-localize-temporary:
git-prompt.sh: make $f local to __git_eread()
Diffstat (limited to 'builtin/merge-index.c')
0 files changed, 0 insertions, 0 deletions