All of lore.kernel.org
 help / color / mirror / Atom feed
From: Albert Astals Cid <albert.astals.cid@kdab.com>
To: "git@vger.kernel.org" <git@vger.kernel.org>
Subject: [PATCH] bash completion: Add --autostash and --no-autostash to pull
Date: Mon, 20 Nov 2017 16:07:49 +0100	[thread overview]
Message-ID: <3893514.emzqGSqeDI@yoga> (raw)

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



             reply	other threads:[~2017-11-20 15:07 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-11-20 15:07 Albert Astals Cid [this message]
2017-11-20 23:14 ` [PATCH] bash completion: Add --autostash and --no-autostash to pull Eric Sunshine
2017-11-21 14:39   ` Albert Astals Cid
  -- 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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=3893514.emzqGSqeDI@yoga \
    --to=albert.astals.cid@kdab.com \
    --cc=git@vger.kernel.org \
    /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. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.