From: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
To: Sascha Hauer <s.hauer@pengutronix.de>
Cc: git@vger.kernel.org, Petr Baudis <pasky@suse.cz>,
martin f krafft <madduck@debian.org>
Subject: Re: [TOPGIT] Resolving conflicts
Date: Mon, 1 Dec 2008 15:36:40 +0100 [thread overview]
Message-ID: <20081201143640.GA17818@cassiopeia.tralala> (raw)
In-Reply-To: <20081201121819.GB13495@pengutronix.de>
[added martin f krafft to Cc:]
Hi,
> Another thing is that the exported branch contains an empty commit
> resulting from t/whatever (and a corresponding empty patch when exported
> as a quilt series)
I fixed one half of this in with a patch sent to the ML:
http://article.gmane.org/gmane.comp.version-control.git/101728
it didn't made it upstream yet, though.
Best regards
Uwe
next prev parent reply other threads:[~2008-12-01 14:38 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-01 12:18 [TOPGIT] Resolving conflicts Sascha Hauer
2008-12-01 14:36 ` Uwe Kleine-König [this message]
2008-12-02 7:49 ` martin f krafft
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=20081201143640.GA17818@cassiopeia.tralala \
--to=u.kleine-koenig@pengutronix.de \
--cc=git@vger.kernel.org \
--cc=madduck@debian.org \
--cc=pasky@suse.cz \
--cc=s.hauer@pengutronix.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 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).