From: Stefan Monnier <monnier@iro.umontreal.ca>
To: Bastien <bzg@gnu.org>
Cc: emacs-devel@gnu.org
Subject: Re: trunk r115910: Fix previous change
Date: Tue, 07 Jan 2014 22:07:50 -0500 [thread overview]
Message-ID: <jwv61pv18at.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <87bnzng15o.fsf@bzg.ath.cx> (Bastien's message of "Tue, 07 Jan 2014 18:19:31 +0100")
> 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
next prev parent reply other threads:[~2014-01-08 3:07 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <E1W0a03-0005VY-IQ@vcs.savannah.gnu.org>
[not found] ` <87k3ebg1p7.fsf@bzg.ath.cx>
2014-01-07 17:15 ` trunk r115910: Fix previous change Glenn Morris
2014-01-07 17:19 ` Bastien
2014-01-08 3:07 ` Stefan Monnier [this message]
2014-01-08 7:24 ` Bastien
2014-01-08 7:40 ` Glenn Morris
2014-01-08 8:44 ` Bastien
2014-01-08 8:41 ` Andreas Schwab
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=jwv61pv18at.fsf-monnier+emacs@gnu.org \
--to=monnier@iro.umontreal.ca \
--cc=bzg@gnu.org \
--cc=emacs-devel@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.