Merge branch 'sd/prompt-local-variable'
authorJunio C Hamano <gitster@pobox.com>
Wed, 11 Nov 2020 21:18:38 +0000 (13:18 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 11 Nov 2020 21:18:38 +0000 (13:18 -0800)
commitfb628ab129dc2a29581e05edd886e3dc16a4ac49
treef0aa80517478477d098a16245b64a0c1142699f8
parent902f358555ca048755e3b9bee6b73dbc0f5d92c6
parent9542d56379b60bb97d17ae1d1c8e8e4bc1fd65a3
Merge branch 'sd/prompt-local-variable'

Code clean-up.

* sd/prompt-local-variable:
  git-prompt.sh: localize `option` in __git_ps1_show_upstream
contrib/completion/git-prompt.sh