[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: trunk r115910: Fix previous change
|
From: |
Bastien |
|
Subject: |
Re: trunk r115910: Fix previous change |
|
Date: |
Wed, 08 Jan 2014 08:24:51 +0100 |
|
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) |
Stefan Monnier <address@hidden> writes:
>> 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)
Noted, thanks,
--
Bastien