emacs-orgmode
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [O] export_file_name problem with new exporter


From: Alan Schmitt
Subject: Re: [O] export_file_name problem with new exporter
Date: Thu, 20 Dec 2012 10:00:16 +0100
User-agent: mu4e 0.9.9.5-dev4; emacs 24.2.1

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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]