# [PATCH] bash completion: Add --autostash and --no-autostash to pull 3 messages from 2017-11-20 to 2017-11-21. Participants: Albert Astals Cid, Eric Sunshine. Thread: https://gitlist.dev/t/47251 ## Albert Astals Cid, 2017-11-20 15:07 Subject: [PATCH] bash completion: Add --autostash and --no-autostash to pull Message-ID: <3893514.emzqGSqeDI@yoga> URL: https://gitlist.dev/e/3893514.emzqGSqeDI%40yoga ``` 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 --- contrib/completion/git-completion.bash | 1 + 1 file changed, 1 insertion(+) 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 " -- 2.15.0 ``` ## Eric Sunshine, 2017-11-20 23:14 Subject: Re: [PATCH] bash completion: Add --autostash and --no-autostash to pull Message-ID: URL: https://gitlist.dev/e/CAPig%2BcTncgDToo0%3DzHsBHfCPMPTYNumNAhTgOnhceLHpse3wuw%40mail.gmail.com In-Reply-To: <3893514.emzqGSqeDI@yoga> ``` On Mon, Nov 20, 2017 at 10:07 AM, Albert Astals Cid 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. > --- > 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 > " ``` ## Albert Astals Cid, 2017-11-21 14:39 Subject: Re: [PATCH] bash completion: Add --autostash and --no-autostash to pull Message-ID: <1951105.ys1K0KXRL2@yoga> URL: https://gitlist.dev/e/1951105.ys1K0KXRL2%40yoga In-Reply-To: ``` El dimarts, 21 de novembre de 2017, a les 0:14:24 CET, Eric Sunshine va escriure: > On Mon, Nov 20, 2017 at 10:07 AM, Albert Astals Cid > > 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. Added. Cheers, Albert > > > --- > > 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 > > > > " -- Albert Astals Cid | albert.astals.cid@kdab.com | Software Engineer Klarälvdalens Datakonsult AB, a KDAB Group company Tel: Sweden (HQ) +46-563-540090, USA +1-866-777-KDAB(5322) KDAB - The Qt, C++ and OpenGL Experts ```