From mboxrd@z Thu Jan  1 00:00:00 1970
From: Alan Schmitt <alan.schmitt@polytechnique.org>
Subject: Re: export_file_name problem with new exporter
Date: Thu, 20 Dec 2012 10:00:16 +0100
Message-ID: <m2y5gt85en.fsf@top-wifi.irisa.fr>
References: <m2sj7icg2r.fsf@top.irisa.fr>, <8738zadrpn.fsf@gmail.com>,
	<m2vcc65aes.fsf@polytechnique.org>, <87y5h2cbao.fsf@gmail.com>,
	<m2txrq59sb.fsf@polytechnique.org>, <87sj7agc5p.fsf@gmail.com>,
	<m27god9oj9.fsf@top-wifi.irisa.fr>, <87sj71w2yg.fsf@Rainer.invalid>
Mime-Version: 1.0
Content-Type: text/plain
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([208.118.235.92]:52300)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <alan.schmitt@polytechnique.org>) id 1TlbzM-0003ij-HR
	for emacs-orgmode@gnu.org; Thu, 20 Dec 2012 04:00:26 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <alan.schmitt@polytechnique.org>) id 1TlbzH-0002V6-Ic
	for emacs-orgmode@gnu.org; Thu, 20 Dec 2012 04:00:24 -0500
Received: from mail1-relais-roc.national.inria.fr ([192.134.164.82]:11882)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <alan.schmitt@polytechnique.org>) id 1TlbzH-0002Tx-By
	for emacs-orgmode@gnu.org; Thu, 20 Dec 2012 04:00:19 -0500
In-reply-to: <87sj71w2yg.fsf@Rainer.invalid>
List-Id: "General discussions about Org-mode." <emacs-orgmode.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/emacs-orgmode>
List-Post: <mailto:emacs-orgmode@gnu.org>
List-Help: <mailto:emacs-orgmode-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=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: Achim Gratz <Stromeko@nexgo.de>
Cc: emacs-orgmode@gnu.org

Achim Gratz writes:

> Alan Schmitt writes:
>> I'll commit as soon as I can find the magic git incantations to get rid
>> of the "merge" commits that happened as I was pulling changes from the
>> repository.
>
> Just cherry-pick your changes on top of the new master or use the
> rewrite facility in magit.

I tried and it did not work. So I just reset everything and applied my
change on top of a clean checkout. It's been pushed.

> If you want to avoid this in general, see:
>
> http://orgmode.org/worg/org-faq.html#keeping-local-changes-current-with-Org-mode-development

This will be most useful, thanks a lot.

Alan