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 > > <albert.astals.cid@xxxxxxxx> 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@xxxxxxxx | 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
