From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rasmus Subject: Re: export to odt: error in style.xml Date: Wed, 08 Oct 2014 02:02:54 +0200 Message-ID: <87zjd71l8x.fsf@gmx.us> References: <20141007142000.7ec1745b@gaia> <87sij0ovoo.fsf@gmx.us> <877g0bu5en.fsf@Rainer.invalid> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:53316) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xbeis-0003ol-81 for emacs-orgmode@gnu.org; Tue, 07 Oct 2014 20:03:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xbeim-0004Vk-GI for emacs-orgmode@gnu.org; Tue, 07 Oct 2014 20:03:18 -0400 Received: from plane.gmane.org ([80.91.229.3]:60725) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xbeim-0004Ux-9y for emacs-orgmode@gnu.org; Tue, 07 Oct 2014 20:03:12 -0400 Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1Xbeii-00078C-IA for emacs-orgmode@gnu.org; Wed, 08 Oct 2014 02:03:08 +0200 Received: from 217.130.110.20 ([217.130.110.20]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 08 Oct 2014 02:03:08 +0200 Received: from rasmus by 217.130.110.20 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 08 Oct 2014 02:03:08 +0200 List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: emacs-orgmode@gnu.org Hi Achim, Thanks for your helpful message. Achim Gratz 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