From: SZEDER Gábor Date: Fri, 21 Oct 2011 13:47:12 GMT Subject: Re: What's cooking in git.git (Oct 2011, #07; Wed, 19) Message-ID: <20111021134712.GA4895@goldbirke> In-Reply-To: <7vk480bq5q.fsf@alter.siamese.dyndns.org> Hi, On Wed, Oct 19, 2011 at 02:57:37PM -0700, Junio C Hamano wrote: > * sg/complete-refs (2011-10-15) 10 commits > - completion: remove broken dead code from __git_heads() and __git_tags() > - completion: fast initial completion for config 'remote.*.fetch' value > - completion: improve ls-remote output filtering in __git_refs_remotes() > - completion: query only refs/heads/ in __git_refs_remotes() > - completion: support full refs from remote repositories > - completion: improve ls-remote output filtering in __git_refs() > - completion: make refs completion consistent for local and remote repos > - completion: optimize refs completion > - completion: document __gitcomp() > - Merge branches 'tm/completion-push-set-upstream', 'tm/completion-commit-fixup-squash' and 'sg/completion' into HEAD I think an octopus merge is unnecessary there, because tm/completion-push-set-upstream is an independent change, and sg/completion builds on top of tm/completion-commit-fixup-squash. So you could just merge sg/completion into HEAD. Best, Gábor