all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Alan Schmitt <alan.schmitt@polytechnique.org>
To: Achim Gratz <Stromeko@nexgo.de>
Cc: emacs-orgmode@gnu.org
Subject: Re: export_file_name problem with new exporter
Date: Thu, 20 Dec 2012 10:00:16 +0100	[thread overview]
Message-ID: <m2y5gt85en.fsf@top-wifi.irisa.fr> (raw)
In-Reply-To: <87sj71w2yg.fsf@Rainer.invalid>

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

  parent reply	other threads:[~2012-12-20  9:00 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-12-07 10:27 export_file_name problem with new exporter Alan Schmitt
2012-12-07 12:29 ` Suvayu Ali
2012-12-07 12:38   ` Alan Schmitt
2012-12-07 12:50     ` Suvayu Ali
2012-12-07 14:02       ` Alan Schmitt
2012-12-07 15:21         ` Suvayu Ali
2012-12-07 16:12           ` Alan Schmitt
2012-12-07 19:09             ` Suvayu Ali
2012-12-08 10:50               ` Alan Schmitt
2012-12-08 11:13                 ` Alan Schmitt
2012-12-08 11:54                   ` Suvayu Ali
2012-12-08 12:03                   ` Achim Gratz
2012-12-09 10:12                     ` Alan Schmitt
2012-12-09 11:04                       ` Achim Gratz
2012-12-09 13:36                         ` Suvayu Ali
2012-12-09 14:03                           ` Jambunathan K
2012-12-09 16:33                           ` Achim Gratz
2012-12-13 13:09 ` Nicolas Goaziou
2012-12-13 13:50   ` Alan Schmitt
2012-12-13 13:49     ` Nicolas Goaziou
2012-12-13 14:03       ` Alan Schmitt
2012-12-13 16:16         ` Nicolas Goaziou
2012-12-20  7:21           ` Alan Schmitt
2012-12-20  8:19             ` Achim Gratz
2012-12-20  8:22               ` Bastien
2012-12-20  9:00               ` Alan Schmitt [this message]
2012-12-13 18:03         ` Achim Gratz
2012-12-13 19:16           ` Alan Schmitt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=m2y5gt85en.fsf@top-wifi.irisa.fr \
    --to=alan.schmitt@polytechnique.org \
    --cc=Stromeko@nexgo.de \
    --cc=emacs-orgmode@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.