git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Adrian Weimann <adrian.weimann@googlemail.com>
To: git@vger.kernel.org, gitster@pobox.com
Cc: Adrian Weimann <adrian.weimann@googlemail.com>
Subject: [PATCH] completion: --edit option for git-merge
Date: Mon, 30 Jan 2012 14:37:50 +0100	[thread overview]
Message-ID: <1327930670-32396-1-git-send-email-adrian.weimann@googlemail.com> (raw)

Signed-off-by: Adrian Weimann <adrian.weimann@googlemail.com>
---
 contrib/completion/git-completion.bash |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 1496c6d..be1fcea 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1622,7 +1622,7 @@ _git_log ()
 
 __git_merge_options="
 	--no-commit --no-stat --log --no-log --squash --strategy
-	--commit --stat --no-squash --ff --no-ff --ff-only
+	--commit --stat --no-squash --ff --no-ff --ff-only --edit
 "
 
 _git_merge ()
-- 
1.7.9

             reply	other threads:[~2012-01-30 13:38 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-01-30 13:37 Adrian Weimann [this message]
2012-01-30 18:15 ` [PATCH] completion: --edit option for git-merge Junio C Hamano
2012-01-30 19:29   ` [PATCH] completion: --edit and --no-edit " Adrian Weimann

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=1327930670-32396-1-git-send-email-adrian.weimann@googlemail.com \
    --to=adrian.weimann@googlemail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.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. 
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).