[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Emacs Mac port
From: |
YAMAMOTO Mitsuharu |
Subject: |
Re: Emacs Mac port |
Date: |
Wed, 01 Apr 2015 09:06:30 +0900 |
User-agent: |
Wanderlust/2.14.0 (Africa) SEMI/1.14.6 (Maruoka) FLIM/1.14.8 (Shijō) APEL/10.6 Emacs/22.3 (sparc-sun-solaris2.8) MULE/5.0 (SAKAKI) |
>>>>> On Tue, 31 Mar 2015 20:42:43 +0200, Steinar Bang <address@hidden> said:
>>>>> Sam Steingold <address@hidden>:
>> why is this not in the official tree?
> I'm guessing because the emacs git master was rebased after it had
> been merged into the mac git, so they are seeing some of the bad
> side effects of repeated merges of rebased commits: duplicate
> history log entries
Actually I don't understand what "the emacs git master was rebased"
means exactly, maybe because I'm very new to git. The Mac port git
repository I published was first constructed on top of a clone of the
Emacs git repository as of January 2015. I'm adding (a pushable copy
of) the Mac port git repository as a "git remote" onto the clone of
the Emacs repository created with the instructions in
admin/notes/git-workflow.
$ git remote -v
emacs-mac localhost:src/emacs-mac.git (fetch)
emacs-mac localhost:src/emacs-mac.git (push)
origin git://git.savannah.gnu.org/emacs.git (fetch)
origin git://git.savannah.gnu.org/emacs.git (push)
YAMAMOTO Mitsuharu
address@hidden