From: "SZEDER Gábor" <szeder@ira.uka.de>
To: "Shawn O. Pearce" <spearce@spearce.org>
Cc: git@vger.kernel.org, "SZEDER Gábor" <szeder@ira.uka.de>
Subject: [PATCH] bash: add 'merge --ff' and '--no-ff' options
Date: Sat, 14 Feb 2009 17:22:56 +0100 [thread overview]
Message-ID: <1234628576-4686-1-git-send-email-szeder@ira.uka.de> (raw)
Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
---
contrib/completion/git-completion.bash | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index e848d5d..ad45717 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1037,6 +1037,7 @@ _git_merge ()
--*)
__gitcomp "
--no-commit --no-stat --log --no-log --squash --strategy
+ --ff --no-ff
"
return
esac
--
1.6.2.rc0.111.g246ed
next reply other threads:[~2009-02-14 16:24 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-14 16:22 SZEDER Gábor [this message]
2009-02-15 5:34 ` [PATCH] bash: add 'merge --ff' and '--no-ff' options Junio C Hamano
2009-02-15 13:25 ` [PATCH v2] bash: add missing 'git merge' options SZEDER Gábor
2009-02-16 15:56 ` Shawn O. Pearce
2009-02-17 2:24 ` Junio C Hamano
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=1234628576-4686-1-git-send-email-szeder@ira.uka.de \
--to=szeder@ira.uka.de \
--cc=git@vger.kernel.org \
--cc=spearce@spearce.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 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 NNTP newsgroup(s).