From: Charles Bailey <charles@hashpling.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Jeff King <peff@peff.net>,
Andreas Ericsson <ae@op5.se>, "Theodore Ts'o" <tytso@mit.edu>,
William Pursell <bill.pursell@gmail.com>
Subject: git mergetool enhancements
Date: Thu, 13 Nov 2008 12:41:12 +0000 [thread overview]
Message-ID: <1226580075-29289-1-git-send-email-charles@hashpling.org> (raw)
Reroll of previously sent mergetool enhancements. Now using -y as the short
option for --no-prompt, but otherwise the same as before.
next reply other threads:[~2008-11-13 12:42 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-11-13 12:41 Charles Bailey [this message]
2008-11-13 12:41 ` [PATCH 1/3] Fix some tab/space inconsistencies in git-mergetool.sh Charles Bailey
2008-11-13 12:41 ` [PATCH 2/3] Add -y/--no-prompt option to mergetool Charles Bailey
2008-11-13 12:41 ` [PATCH 3/3] Add -k/--keep-going " Charles Bailey
2008-11-14 6:47 ` Jeff King
2008-11-14 13:25 ` Charles Bailey
2008-11-14 16:21 ` Jeff King
2008-11-15 16:12 ` Theodore Tso
2008-11-15 5:35 ` Junio C Hamano
2008-11-15 5:38 ` Jeff King
2008-11-24 21:59 ` Charles Bailey
2008-11-15 15:56 ` Theodore Tso
2008-11-24 22:03 ` Charles Bailey
2008-11-15 15:50 ` [PATCH 2/3] Add -y/--no-prompt " Theodore Tso
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=1226580075-29289-1-git-send-email-charles@hashpling.org \
--to=charles@hashpling.org \
--cc=ae@op5.se \
--cc=bill.pursell@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
--cc=tytso@mit.edu \
/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.