[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Rewriting bzrmerge.el
From: |
Stefan Monnier |
Subject: |
Re: Rewriting bzrmerge.el |
Date: |
Sat, 22 Nov 2014 17:28:59 -0500 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) |
> AFAIU, not if there's no checkout of emacs-24 there.
"git merge" (and I assume gitmerge.el) doesn't require a checkout of the
branch which you're trying to merge. It just needs to be in the
repository, which it usually will in the case of merging emacs-24 to
master since they both come from the same repository, so you'd have to
do a "clone" that only fetches "master" in order not to have emacs-24.
Stefan
- Re: Rewriting bzrmerge.el, (continued)
- Re: Rewriting bzrmerge.el, Eli Zaretskii, 2014/11/22
- Re: Rewriting bzrmerge.el, David Engster, 2014/11/22
- Re: Rewriting bzrmerge.el, Eli Zaretskii, 2014/11/22
- Re: Rewriting bzrmerge.el, David Engster, 2014/11/22
- Re: Rewriting bzrmerge.el, Eli Zaretskii, 2014/11/22
- Re: Rewriting bzrmerge.el, Steinar Bang, 2014/11/23
- Re: Rewriting bzrmerge.el, David Engster, 2014/11/23
- Re: Rewriting bzrmerge.el, Eli Zaretskii, 2014/11/23
- Re: Rewriting bzrmerge.el, Steinar Bang, 2014/11/23
- Re: Rewriting bzrmerge.el, Eli Zaretskii, 2014/11/23
- Re: Rewriting bzrmerge.el,
Stefan Monnier <=
- Re: Rewriting bzrmerge.el, Lars Magne Ingebrigtsen, 2014/11/22
- Re: Rewriting bzrmerge.el, Stephen J. Turnbull, 2014/11/22
- Re: Rewriting bzrmerge.el, David Kastrup, 2014/11/23
- Re: Rewriting bzrmerge.el, Eli Zaretskii, 2014/11/23
- Re: Rewriting bzrmerge.el, David Kastrup, 2014/11/23
- Re: Rewriting bzrmerge.el, Achim Gratz, 2014/11/23
- Re: Rewriting bzrmerge.el, Eli Zaretskii, 2014/11/23
- Re: Rewriting bzrmerge.el, Stephen J. Turnbull, 2014/11/23
- Re: Rewriting bzrmerge.el, David Kastrup, 2014/11/23
- Re: Rewriting bzrmerge.el, Eli Zaretskii, 2014/11/23