From mboxrd@z Thu Jan  1 00:00:00 1970
From: Achim Gratz <Stromeko@nexgo.de>
Subject: Re: export_file_name problem with new exporter
Date: Thu, 20 Dec 2012 09:19:19 +0100
Message-ID: <87sj71w2yg.fsf@Rainer.invalid>
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>
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]:44929)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <geo-emacs-orgmode@m.gmane.org>) id 1TlbLz-0001K9-CH
	for emacs-orgmode@gnu.org; Thu, 20 Dec 2012 03:19:44 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <geo-emacs-orgmode@m.gmane.org>) id 1TlbLn-0007K5-4p
	for emacs-orgmode@gnu.org; Thu, 20 Dec 2012 03:19:43 -0500
Received: from plane.gmane.org ([80.91.229.3]:45336)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <geo-emacs-orgmode@m.gmane.org>) id 1TlbLm-0007Jq-Uz
	for emacs-orgmode@gnu.org; Thu, 20 Dec 2012 03:19:31 -0500
Received: from list by plane.gmane.org with local (Exim 4.69)
	(envelope-from <geo-emacs-orgmode@m.gmane.org>) id 1TlbLz-00027t-EK
	for emacs-orgmode@gnu.org; Thu, 20 Dec 2012 09:19:43 +0100
Received: from pd9eb272f.dip.t-dialin.net ([217.235.39.47])
	by main.gmane.org with esmtp (Gmexim 0.1 (Debian))
	id 1AlnuQ-0007hv-00
	for <emacs-orgmode@gnu.org>; Thu, 20 Dec 2012 09:19:43 +0100
Received: from Stromeko by pd9eb272f.dip.t-dialin.net with local (Gmexim 0.1
	(Debian)) id 1AlnuQ-0007hv-00
	for <emacs-orgmode@gnu.org>; Thu, 20 Dec 2012 09:19:43 +0100
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: emacs-orgmode@gnu.org

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.  If you want to avoid this in general, see:

http://orgmode.org/worg/org-faq.html#keeping-local-changes-current-with-Org-mode-development


Regards,
Achim.
-- 
+<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+

SD adaptation for Waldorf Blofeld V1.15B11:
http://Synth.Stromeko.net/Downloads.html#WaldorfSDada