emacs-devel
[Top][All Lists]
Advanced

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

Re: git commit/push and VC


From: Ivan Shmakov
Subject: Re: git commit/push and VC
Date: Sat, 22 Nov 2014 06:50:51 +0000
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux)

>>>>> Stephen J Turnbull <address@hidden> writes:

[…]

 > Technically speaking, it's not possible in git to merge between
 > clones, you have to fetch and then merge (== pull).

        Not necessarily, – you can just as well add the Git (or, rather,
        .git/objects) directory of your “other” clone to your current’s
        .git/objects/info/alternates, which will make the other clone’s
        commits available for any operation – including merge – on the
        current one.  Like, say:

$ cat < emacs-foo/.git/objects 
../../../emacs-bar/.git/objects
../../../emacs-qux/.git/objects
/read/only/archives/git/emacs.git/objects
$ 

        If you do not care about the warning, you can even do this is in
        a cyclic manner:

$ cat < emacs-bar/.git/objects 
../../../emacs-foo/.git/objects
../../../emacs-qux/.git/objects
/read/only/archives/git/emacs.git/objects
$ 

[…]

-- 
FSF associate member #7257  http://boycottsystemd.org/  … 3013 B6A0 230E 334A



reply via email to

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