Re: [PATCH] bash completion: Add --autostash and --no-autostash to pull

From: Eric Sunshine <sunshine@sunshineco.com>
Date: Nov 20, 2017, 23:14 UTC
Message-ID: <CAPig+cTncgDToo0=zHsBHfCPMPTYNumNAhTgOnhceLHpse3wuw@mail.gmail.com>
In-Reply-To: <3893514.emzqGSqeDI@yoga>

On Mon, Nov 20, 2017 at 10:07 AM, Albert Astals Cid <albert.astals.cid@kdab.com> wrote:

> Ideally we should only autocomplete if pull has --rebase since
> they only work with it but could not figure out how to do that
> and the error message of doing git pull --autostash points out
> that you need --rebase so i guess it's good enough

Missing Signed-off-by:. See Documentation/SubmittingPatches. Thanks.

Show 14 quoted lines

> ---
> diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-
> completion.bash
> index 539d7f84f..7ded58f38 100644
> --- a/contrib/completion/git-completion.bash
> +++ b/contrib/completion/git-completion.bash
> @@ -1923,6 +1923,7 @@ _git_pull ()
>         --*)
>                 __gitcomp "
>                         --rebase --no-rebase
> +                       --autostash --no-autostash
>                         $__git_merge_options
>                         $__git_fetch_options
>                 "