|
From: | Bastien |
Subject: | Re: [O] export_file_name problem with new exporter |
Date: | Thu, 20 Dec 2012 09:22:13 +0100 |
User-agent: | Gnus/5.130006 (Ma Gnus v0.6) Emacs/24.3.50 (gnu/linux) |
Hi Alan, Achim Gratz <address@hidden> 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
[Prev in Thread] | Current Thread | [Next in Thread] |