Re: [PATCH] completion: add --graph to log command completion

From: Shawn O. Pearce <spearce@spearce.org>
Date: Jun 19, 2008, 22:55 UTC
Message-ID: <20080619225552.GQ11793@spearce.org>
In-Reply-To: <20080619224012.GA6705@mithlond.arda.local>

Teemu Likonen <tlikonen@iki.fi> wrote:

> I think I have already sent twice a patch with --graph completion.

I didn't Ack them because at the time --graph wasn't even in next yet I think. Then I got busy and forgot. And --graph slipped through into the 1.5.6 release without your bash completion patches. Sorry.

Show 8 quoted lines

> ---snip---
> bash: Add more option completions for 'git log'
> 
> Options added: --graph --walk-reflogs --stat --numstat --shortstat
> --decorate --diff-filter= --color-words
> 
> Signed-off-by: Teemu Likonen <tlikonen@iki.fi>
> ---

This conflicts with the patch you are replying to, but it makes sense to do these options as well.

Acked-by: Shawn O. Pearce <spearce@spearce.org>

assuming the semantic (or merge) conflict on --graph is worked out. ;-)

Show 20 quoted lines

>  contrib/completion/git-completion.bash |    3 +++
>  1 files changed, 3 insertions(+), 0 deletions(-)
> 
> diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
> index 506b40c..e78ca8e 100755
> --- a/contrib/completion/git-completion.bash
> +++ b/contrib/completion/git-completion.bash
> @@ -761,6 +761,9 @@ _git_log ()
>  			--pretty= --name-status --name-only --raw
>  			--not --all
>  			--left-right --cherry-pick
> +			--stat --numstat --shortstat
> +			--decorate --diff-filter=
> +			--color-words --walk-reflogs --graph
>  			"
>  		return
>  		;;
> -- 
> 1.5.6.2.g3c3a
>

-- 
Shawn.