From: Albert Astals Cid <albert.astals.cid@kdab.com>
To: Eric Sunshine <sunshine@sunshineco.com>
Cc: "git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: [PATCH] bash completion: Add --autostash and --no-autostash to pull
Date: Tue, 21 Nov 2017 15:39:51 +0100 [thread overview]
Message-ID: <1951105.ys1K0KXRL2@yoga> (raw)
In-Reply-To: <CAPig+cTncgDToo0=zHsBHfCPMPTYNumNAhTgOnhceLHpse3wuw@mail.gmail.com>
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@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.
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
next prev parent reply other threads:[~2017-11-21 14:39 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-20 15:07 [PATCH] bash completion: Add --autostash and --no-autostash to pull Albert Astals Cid
2017-11-20 23:14 ` Eric Sunshine
2017-11-21 14:39 ` Albert Astals Cid [this message]
-- strict thread matches above, loose matches on Subject: below --
2017-11-21 14:39 Albert Astals Cid
2017-11-24 18:09 ` SZEDER Gábor
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1951105.ys1K0KXRL2@yoga \
--to=albert.astals.cid@kdab.com \
--cc=git@vger.kernel.org \
--cc=sunshine@sunshineco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).