From: Theodore Tso <tytso@mit.edu>
To: Junio C Hamano <gitster@pobox.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: Please pull mergetool.git
Date: Sun, 10 Jun 2007 17:31:17 -0400 [thread overview]
Message-ID: <20070610213117.GA15117@thunk.org> (raw)
In-Reply-To: <7v1wgj8tzy.fsf@assigned-by-dhcp.cox.net>
On Sun, Jun 10, 2007 at 12:55:13PM -0700, Junio C Hamano wrote:
> But I hope you would not be offended if I said I do not want to.
>
> This is not such a strong objection, but I really wish that you
> did not mix in the .gitignore change; it does not belong to this
> "series".
OK, no problem. It was something I noticed while I was preparing the
series, and I thought it was non-controverisal enough to just throw it
in. It's at the tail of the series, so it's easy enough for me to do a
git reset --hard HEAD^
on the mergetool branch.... OK, done. If you pull from
git://repo.or.cz/git/mergetool.git mergetool
You'll only get the first two changes to git-mergetool, and the
.gitignore change has been dropped.
Regards,
- Ted
next prev parent reply other threads:[~2007-06-10 21:31 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-06-10 16:03 Please pull mergetool.git Theodore Ts'o
2007-06-10 19:55 ` Junio C Hamano
2007-06-10 21:31 ` Theodore Tso [this message]
2007-06-10 23:29 ` Brian Gernhardt
2007-06-11 1:02 ` Junio C Hamano
2007-06-11 1:55 ` Martin Langhoff
2007-06-11 13:31 ` Theodore Tso
-- strict thread matches above, loose matches on Subject: below --
2007-09-29 14:47 Theodore Ts'o
2007-09-29 22:43 ` 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=20070610213117.GA15117@thunk.org \
--to=tytso@mit.edu \
--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).