From: Joey Hess <id@joeyh.name>
To: "Torsten Bögershausen" <tboegi@web.de>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: What's cooking in git.git (Jun 2016, #05; Thu, 16)
Date: Wed, 22 Jun 2016 17:09:58 -0400 [thread overview]
Message-ID: <20160622210958.GA24618@kitenet.net> (raw)
In-Reply-To: <18617acb-bcdb-607d-007e-552dabd352cb@web.de>
[-- Attachment #1: Type: text/plain, Size: 623 bytes --]
Torsten Bögershausen wrote:
> There is a conflict in pu:
> "jh/clean-smudge-annex" does not work together with "tb/convert-peek-in-index"
>
> (And currently pu didn't compile)
I'm sending a v4 of jh/clean-smudge-annex that is rebased on top of
tb/convert-peek-in-index to fix this.
> (I will hopefully be able to do a separate review of the smudge/clean patch)
Would be appreciated. It'll be 2 weeks until I can work on this any more.
> (And joeyh@joeyh.name is not reachable from web.de)
I'd like to fix whatever's broken; you could send details out of band to
joeyhess@gmail.com
--
see shy jo
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 811 bytes --]
next prev parent reply other threads:[~2016-06-22 21:10 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-17 3:20 What's cooking in git.git (Jun 2016, #05; Thu, 16) Junio C Hamano
2016-06-17 13:25 ` Pranit Bauva
2016-06-17 17:55 ` Vasco Almeida
2016-06-17 22:05 ` Lars Schneider
2016-06-17 22:17 ` Junio C Hamano
2016-06-18 17:09 ` Michael Haggerty
2016-06-19 7:59 ` Michael Haggerty
2016-06-19 15:04 ` Lars Schneider
2016-06-19 16:11 ` Lars Schneider
2016-06-19 18:13 ` Junio C Hamano
2016-06-19 18:49 ` Lars Schneider
2016-06-19 18:53 ` Lars Schneider
2016-06-19 18:09 ` Junio C Hamano
2016-06-19 23:51 ` Junio C Hamano
2016-06-20 7:57 ` Lars Schneider
2016-06-23 7:32 ` Michael Haggerty
2016-06-27 7:09 ` Lars Schneider
2016-06-27 16:29 ` Junio C Hamano
2016-06-28 9:23 ` Michael Haggerty
2016-06-28 17:44 ` Junio C Hamano
2016-06-18 4:18 ` Michael Haggerty
2016-06-18 18:20 ` Junio C Hamano
2016-06-19 8:15 ` Michael Haggerty
2016-06-19 18:07 ` Junio C Hamano
2016-06-20 6:06 ` Torsten Bögershausen
2016-06-20 20:06 ` Junio C Hamano
2016-06-22 21:09 ` Joey Hess [this message]
2016-06-23 13:13 ` Torsten Bögershausen
2016-07-12 22:20 ` Joey Hess
2016-07-14 2:09 ` Torsten Bögershausen
2016-07-14 18:17 ` 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=20160622210958.GA24618@kitenet.net \
--to=id@joeyh.name \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=tboegi@web.de \
/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.