From: Lee Marlow <lee.marlow@gmail.com>
To: "Shawn O. Pearce" <spearce@spearce.org>
Cc: git@vger.kernel.org, Lee Marlow <lee.marlow@gmail.com>
Subject: [PATCH 2/2] bash completion: Add '--merge' long option for 'git log'
Date: Thu, 14 Aug 2008 16:41:11 -0600 [thread overview]
Message-ID: <1218753671-58099-3-git-send-email-lee.marlow@gmail.com> (raw)
In-Reply-To: <1218753671-58099-2-git-send-email-lee.marlow@gmail.com>
Signed-off-by: Lee Marlow <lee.marlow@gmail.com>
---
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 4089670..bdf4f4a 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -972,6 +972,7 @@ _git_log ()
--decorate --diff-filter=
--color-words --walk-reflogs
--parents --children --full-history
+ --merge
"
return
;;
--
1.6.0.rc3.6.ga0653
next prev parent reply other threads:[~2008-08-14 22:42 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-14 22:41 [PATCH 0/2] Helpful completions for merging Lee Marlow
2008-08-14 22:41 ` [PATCH 1/2] bash completion: Add completion for 'git mergetool' Lee Marlow
2008-08-14 22:41 ` Lee Marlow [this message]
2008-08-15 0:05 ` Shawn O. Pearce
2008-08-15 0:15 ` Junio C Hamano
2008-08-15 0:18 ` Shawn O. Pearce
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=1218753671-58099-3-git-send-email-lee.marlow@gmail.com \
--to=lee.marlow@gmail.com \
--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).