From: SZEDER Gábor Date: Sat, 08 Oct 2011 01:09:34 GMT Subject: [PATCH 2/2] completion: unite --format and --pretty for 'log' and 'show' Message-ID: <20111008010934.GC11561@goldbirke> In-Reply-To: <20111008010432.GA11561@goldbirke> Signed-off-by: SZEDER Gábor --- contrib/completion/git-completion.bash | 18 ++++-------------- 1 files changed, 4 insertions(+), 14 deletions(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 98282435..b36f9e70 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1553,14 +1553,9 @@ _git_log () merge="--merge" fi case "$cur" in - --pretty=*) + --pretty=*|--format=*) __gitcomp "$__git_log_pretty_formats $(__git_pretty_aliases) - " "" "${cur##--pretty=}" - return - ;; - --format=*) - __gitcomp "$__git_log_pretty_formats $(__git_pretty_aliases) - " "" "${cur##--format=}" + " "" "${cur#*=}" return ;; --date=*) @@ -2365,14 +2360,9 @@ _git_show () __git_has_doubledash && return case "$cur" in - --pretty=*) - __gitcomp "$__git_log_pretty_formats $(__git_pretty_aliases) - " "" "${cur##--pretty=}" - return - ;; - --format=*) + --pretty=*|--format=*) __gitcomp "$__git_log_pretty_formats $(__git_pretty_aliases) - " "" "${cur##--format=}" + " "" "${cur#*=}" return ;; --*) -- 1.7.7.187.ga41de