From: Felipe Contreras <felipe.contreras@gmail.com>
To: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: RE: What's cooking in git.git (May 2013, #08; Tue, 28)
Date: Tue, 28 May 2013 21:55:41 -0500 [thread overview]
Message-ID: <51a56e2db218d_807b33e18100177@nysa.mail> (raw)
In-Reply-To: <7vli6yydmv.fsf@alter.siamese.dyndns.org>
Junio C Hamano wrote:
> * fc/makefile (2013-05-26) 5 commits
> - build: do not install git-remote-testpy
> - build: add NO_INSTALL variable
> - build: cleanup using $<
> - build: cleanup using $^
> - build: trivial simplification
> (this branch is used by fc/remote-helpers-use-specified-python.)
No, these are independent.
> * fc/remote-helpers-use-specified-python (2013-05-28) 4 commits
> - remote-helpers: add exec-path links
> - remote-helpers: allow direct test execution
> - remote-helpers: rename tests
> - remote-helpers: generate scripts
> (this branch uses fc/makefile.)
>
> I do not particularly think the second from the bottom is a good
> change, but it takes the remainder of the series hostage.
> Will hopefully be rerolled without it.
> * fc/remote-bzr (2013-05-28) 8 commits
> - remote-bzr: add fallback check for a partial clone
> - remote-bzr: reorganize the way 'wanted' works
> - remote-bzr: trivial cleanups
> - remote-bzr: change global repo
> - remote-bzr: delay cloning/pulling
> - remote-bzr: simplify get_remote_branch()
> - remote-bzr: fix for files with spaces
> - remote-bzr: recover from failed clones
>
> The ones near the tip conflicted with the hotfix for 1.8.3 so I
> discarded them for now.
>
> Will merge to 'next'?
Didn't I resend these with the conflict fixed?
--
Felipe Contreras
next prev parent reply other threads:[~2013-05-29 3:02 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-28 21:54 What's cooking in git.git (May 2013, #08; Tue, 28) Junio C Hamano
2013-05-29 2:55 ` Felipe Contreras [this message]
2013-05-29 17:29 ` Junio C Hamano
2013-05-29 18:46 ` Felipe Contreras
2013-05-29 11:11 ` [PATCH] fixup! rebase: implement --[no-]autostash and rebase.autostash Ramkumar Ramachandra
2013-05-29 17:32 ` Junio C Hamano
2013-05-29 17:38 ` Ramkumar Ramachandra
2013-05-29 17:38 ` Matthieu Moy
2013-05-29 11:27 ` What's cooking in git.git (May 2013, #08; Tue, 28) Ramkumar Ramachandra
2013-05-29 17:45 ` Junio C Hamano
2013-05-29 18:15 ` Ramkumar Ramachandra
2013-05-29 23:44 ` Ramsay Jones
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=51a56e2db218d_807b33e18100177@nysa.mail \
--to=felipe.contreras@gmail.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).