From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 16 May 2011 23:47:00 +0000 (-0700)
Subject: Merge branch 'sg/completion-updates'
X-Git-Tag: v1.7.6-rc0~65
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=018443526875456d335fef2dfbc78bc4de2d340d;p=git.git

Merge branch 'sg/completion-updates'

* sg/completion-updates:
  Revert "completion: don't declare 'local words' to make zsh happy"
  git-completion: fix regression in zsh support
  completion: move private shopt shim for zsh to __git_ namespace
  completion: don't declare 'local words' to make zsh happy
---

018443526875456d335fef2dfbc78bc4de2d340d