From: Achim Gratz <Stromeko@nexgo.de>
To: emacs-orgmode@gnu.org
Subject: Re: export to odt: error in style.xml
Date: Fri, 10 Oct 2014 20:58:12 +0200 [thread overview]
Message-ID: <8738aveoqj.fsf@Rainer.invalid> (raw)
In-Reply-To: 87zjd71l8x.fsf@gmx.us
Rasmus writes:
>> Could you please rebase or cherry-pick your changes onto the
>> then-current master before committing them?
>
> Yes, I am very happy to!
>
> However, can you please elaborate on what exactly I did wrong? I have
> checked for the following to understand your criticism:
>
> 1. When I do $ git diff 004332b^ 00433b I get a one line diff (except
> the context). There are no change of white space or other garbage.
> Why is this not cherry-picked?
[…]
This one is, but your earlier commits introduced half a dozen spurious
merges since they were all started at different points on master.
> In principal it is true. However, is it a real issue¹ in practice?
The script that generates the ChangeLog for the Emacs merge will list
all of these separately and Bastien or who else is doing the merge will
have to manually put them back together.
> ¹ It pains me every time I use my private email for public mailing
> list, but I doubt you had my privacy in mind?
I was asking no such thing, only that the author name and email you use
for your commits are always one and the same.
Regards,
Achim.
--
+<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+
SD adaptations for Waldorf Q V3.00R3 and Q+ V3.54R2:
http://Synth.Stromeko.net/Downloads.html#WaldorfSDada
next prev parent reply other threads:[~2014-10-10 18:58 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20141007142000.7ec1745b@gaia>
2014-10-07 13:28 ` export to odt: error in style.xml Rasmus
2014-10-07 18:00 ` Achim Gratz
2014-10-08 0:02 ` Rasmus
2014-10-10 18:58 ` Achim Gratz [this message]
2014-10-11 12:46 ` Bastien
2014-10-14 9:08 ` Rasmus
2014-10-07 11:11 Detlef Steuer
2014-10-07 11:53 ` Rasmus
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
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8738aveoqj.fsf@Rainer.invalid \
--to=stromeko@nexgo.de \
--cc=emacs-orgmode@gnu.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.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).