From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 11 Nov 2020 21:18:38 +0000 (-0800)
Subject: Merge branch 'sd/prompt-local-variable'
X-Git-Tag: v2.30.0-rc0~100
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fb628ab129dc2a29581e05edd886e3dc16a4ac49;p=thirdparty%2Fgit.git

Merge branch 'sd/prompt-local-variable'

Code clean-up.

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

fb628ab129dc2a29581e05edd886e3dc16a4ac49