From: Junio C Hamano <junkio@cox.net>
To: Linus Torvalds <torvalds@osdl.org>
Cc: git@vger.kernel.org
Subject: Re: Last mile for 1.0
Date: Sun, 05 Jun 2005 23:35:26 -0700 [thread overview]
Message-ID: <7vpsv0uh5d.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <Pine.LNX.4.58.0506052300350.1876@ppc970.osdl.org> (Linus Torvalds's message of "Sun, 5 Jun 2005 23:13:11 -0700 (PDT)")
>>>>> "LT" == Linus Torvalds <torvalds@osdl.org> writes:
LT> And the "git-merge-one-file-script" thing needs to be updated to keep the
LT> tree updated as it merges things by hand, since it can't depend on the
LT> git-checkout-cache fixing things up any more. Anybody?
I'd love to bite. One problem I have been having for the last
30 minutes or so is that t1000 test (merge from h*ll) does not
show that read-tree resolving even the trivial ones anymore, and
I do not know if you want make it that the responsibility of
git-merge-one-file-script, or if it is just an oversight.
I might have leave that to Europeans, though, due to timezone
differences ;-).
next prev parent reply other threads:[~2005-06-06 6:32 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-06-05 21:39 [PATCH] Documentation: describe git extended diff headers Junio C Hamano
2005-06-05 22:11 ` Linus Torvalds
2005-06-05 22:25 ` [PATCH] Fix diff.c to match rename extended header to the document Junio C Hamano
2005-06-05 22:27 ` [PATCH] Fix apply.c " Junio C Hamano
2005-06-05 22:33 ` Linus Torvalds
2005-06-05 23:21 ` Last mile for 1.0 Junio C Hamano
2005-06-05 23:45 ` Junio C Hamano
2005-06-06 13:29 ` McMullan, Jason
2005-06-06 0:02 ` Linus Torvalds
2005-06-06 0:46 ` [PATCH] git-whatchanged vs "cvs annotate" Junio C Hamano
2005-06-06 5:43 ` Last mile for 1.0 Thomas Glanzmann
2005-06-06 6:13 ` Linus Torvalds
2005-06-06 6:35 ` Junio C Hamano [this message]
2005-06-06 6:44 ` Linus Torvalds
2005-06-06 6:44 ` Thomas Glanzmann
2005-06-06 6:57 ` Linus Torvalds
2005-06-06 7:01 ` Thomas Glanzmann
2005-06-06 7:05 ` Junio C Hamano
2005-06-06 14:37 ` Linus Torvalds
[not found] ` <7vy89ns354.fsf_-_@assigned-by-dhcp.cox.net>
[not found] ` <Pine.LNX.4.58.0506061312520.1876@ppc970.osdl.org>
[not found] ` <Pine.LNX.4.58.0506061403170.1876@ppc970.osdl.org>
[not found] ` <7vekbfnot9.fsf@assigned-by-dhcp.cox.net>
[not found] ` <Pine.LNX.4.58.0506061453400.1876@ppc970.osdl.org>
[not found] ` <7vy89mlmsv.fsf_-_@assigned-by-dhcp.cox.net>
[not found] ` <7vis0qk2jo.fsf_-_@assigned-by-dhcp.cox.net>
[not found] ` <Pine.LNX.4.58.0506070808180.2286@ppc970.osdl.org>
2005-06-08 3:53 ` 3-way read-tree case matrix Junio C Hamano
2005-06-08 5:32 ` Junio C Hamano
2005-06-08 9:08 ` [PATCH] Tests: read-tree -m test updates Junio C Hamano
2005-06-06 6:45 ` Last mile for 1.0 Junio C Hamano
2005-06-06 7:03 ` Linus Torvalds
[not found] ` <7vacm4ufnl.fsf@assigned-by-dhcp.cox.net>
2005-06-06 14:47 ` Linus Torvalds
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=7vpsv0uh5d.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=git@vger.kernel.org \
--cc=torvalds@osdl.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