[Top][All Lists]

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

Re: trunk r115910: Fix previous change

From: Stefan Monnier
Subject: Re: trunk r115910: Fix previous change
Date: Tue, 07 Jan 2014 22:07:50 -0500
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux)

> I never found the time to learn how to setup a proper
> merge system, and with bzr being replaced soonish, I'll
> wait until then to see how I can merge the clean way.

It's easy: note down somewhere the Git revision of the last sync.
Then for a new sync do:

   git diff -r <lastsync> | (cd ..../emacs/lisp/org; patch)

-- Stefan

reply via email to

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