From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bastien Subject: Re: export_file_name problem with new exporter Date: Thu, 20 Dec 2012 09:22:13 +0100 Message-ID: <87k3sddtfu.fsf@bzg.ath.cx> References: <8738zadrpn.fsf@gmail.com> <87y5h2cbao.fsf@gmail.com> <87sj7agc5p.fsf@gmail.com> <87sj71w2yg.fsf@Rainer.invalid> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([208.118.235.92]:45560) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TlbOT-0002c3-CE for emacs-orgmode@gnu.org; Thu, 20 Dec 2012 03:22:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TlbOS-0008HI-62 for emacs-orgmode@gnu.org; Thu, 20 Dec 2012 03:22:17 -0500 Received: from mail-wg0-f52.google.com ([74.125.82.52]:38402) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TlbOR-0008H5-TB for emacs-orgmode@gnu.org; Thu, 20 Dec 2012 03:22:16 -0500 Received: by mail-wg0-f52.google.com with SMTP id 12so1390563wgh.7 for ; Thu, 20 Dec 2012 00:22:15 -0800 (PST) In-Reply-To: <87sj71w2yg.fsf@Rainer.invalid> (Achim Gratz's message of "Thu, 20 Dec 2012 09:19:19 +0100") 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: Achim Gratz Cc: emacs-orgmode@gnu.org Hi Alan, 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. If you want to avoid this in general, see: > > http://orgmode.org/worg/org-faq.html#keeping-local-changes-current-with-Org-mode-development ... or simply don't worry too much about the merge commits. -- Bastien