emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed

From: Rasmus <rasmus@gmx.us>
To: emacs-orgmode@gnu.org
Subject: Re: export to odt: error in style.xml
Date: Wed, 08 Oct 2014 02:02:54 +0200	[thread overview]
Message-ID: <87zjd71l8x.fsf@gmx.us> (raw)
In-Reply-To: 877g0bu5en.fsf@Rainer.invalid

Hi Achim,

Thanks for your helpful message.

Achim Gratz <Stromeko@nexgo.de> writes:

> Rasmus writes:
>> In the future you should sent minimal examples.  In this case it did
>> not matter and the mentioned commit was indeed to blame.  It should be
>> fixed in master @ 004332b.
>
> 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?
  2. I know I git pull --rebase'ed before I submitted.  I believe the
     patch was only submitted to master, since it shows up on git log
     when I'm on the master branch but not on the maint branch.  This is
     true for my local checkout and for cgit online.  
     Why is this not against the current master?
  3. There is no nasty "Merge branch..." so, again, why is it not
     cherry picked?

I'm not claiming to be an expert of anything, least of all of
anything–software, so please be explicit so I can learn to commit
better.

> Also, you might want to decide on a single mail address for these
> committs.

In principal it is true.  However, is it a real issue¹ in practice?
Rest assured it is always a real email address checked frequently.  It
happens because I use several computers and I sometimes forget to
correct .git/config.  If it *is* a real issue, I could change my
global git config, though it is configured the way it is for a reason.

Thanks,
Rasmus

Footnotes: 

¹ It pains me every time I use my private email for public mailing
list, but I doubt you had my privacy in mind?

-- 
This is the kind of tedious nonsense up with which I will not put

next prev parent reply	other threads:[~2014-10-08  0:03 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 [this message]
2014-10-10 18:58       ` Achim Gratz
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=87zjd71l8x.fsf@gmx.us \
    --to=rasmus@gmx.us \
    --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

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).