From: Junio C Hamano Date: Wed, 18 Feb 2009 19:02:35 GMT Subject: Re: [PATCH v2 2/2] bash completion: only show 'log --merge' if merging Message-ID: <7vwsbnwotw.fsf@gitster.siamese.dyndns.org> In-Reply-To: <20090218170518.GD22848@spearce.org> "Shawn O. Pearce" writes: > Thomas Rast wrote: >> The gitk completion only shows --merge if MERGE_HEAD is present. >> Do it the same way for git-log completion. >> >> Signed-off-by: Thomas Rast >> --- >> contrib/completion/git-completion.bash | 7 ++++++- >> 1 files changed, 6 insertions(+), 1 deletions(-) > > Both patches, > > Acked-by: Shawn O. Pearce Thanks.