]> git.ipfire.org Git - thirdparty/git.git/commitdiff
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)
Code clean-up.

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

1  2 
contrib/completion/git-prompt.sh

Simple merge