> The patch adds BASH completion for a newly added option.

There is a '--no-indent-heuristic' option, too, and a
'diff.indentHeuristic' config variable as well.

I'm not sure it's worth it, though.  As far as I remember the future
plans for indent heuristics, this option and config variable are only
temporary, and this heuristic will become the default after a few
releases of testing anyway (assuming that nothing prohibitive pops up
in the meantime).


> --------------5BA49415AE751679784E55AA
> Content-Type: text/x-patch;
>  name="0001-Add-indent-heuristic-to-bash-completion.patch"
> Content-Transfer-Encoding: 7bit
> Content-Disposition: attachment;
>  filename="0001-Add-indent-heuristic-to-bash-completion.patch"
> 
> >From 316355276a9772cdfdd24a81f19400f176944df2 Mon Sep 17 00:00:00 2001
> From: marxin <mli...@suse.cz>
> Date: Tue, 25 Apr 2017 13:35:17 +0200
> Subject: [PATCH] Add --indent-heuristic to bash completion.
> 
> Signed-off-by: Martin Liska <mli...@suse.cz>
> ---
>  contrib/completion/git-completion.bash | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/contrib/completion/git-completion.bash 
> b/contrib/completion/git-completion.bash
> index 1150164d5..8fb25594c 100644
> --- a/contrib/completion/git-completion.bash
> +++ b/contrib/completion/git-completion.bash
> @@ -1395,7 +1395,7 @@ __git_diff_common_options="--stat --numstat --shortstat 
> --summary
>                       --quiet --ext-diff --no-ext-diff
>                       --no-prefix --src-prefix= --dst-prefix=
>                       --inter-hunk-context=
> -                     --patience --histogram --minimal
> +                     --patience --histogram --indent-heuristic --minimal
>                       --raw --word-diff --word-diff-regex=
>                       --dirstat --dirstat= --dirstat-by-file
>                       --dirstat-by-file= --cumulative
> @@ -1482,6 +1482,7 @@ __git_format_patch_options="
>       --not --all --cover-letter --no-prefix --src-prefix= --dst-prefix=
>       --inline --suffix= --ignore-if-in-upstream --subject-prefix=
>       --output-directory --reroll-count --to= --quiet --notes
> +     --indent-heuristic
>  "
>  
>  _git_format_patch ()
> @@ -1681,6 +1682,7 @@ __git_log_common_options="
>       --min-age= --until= --before=
>       --min-parents= --max-parents=
>       --no-min-parents --no-max-parents
> +     --indent-heuristic
>  "
>  # Options that go well for log and gitk (not shortlog)
>  __git_log_gitk_options="
> -- 
> 2.12.2

Reply via email to