From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Ivan Shmakov Newsgroups: gmane.emacs.devel Subject: Re: git commit/push and VC Date: Sat, 22 Nov 2014 06:50:51 +0000 Message-ID: <87k32nwwxg.fsf@violet.siamics.net> References: <871toysqyq.fsf@rosalinde.fritz.box> <838uj57u5b.fsf@gnu.org> <87ppchd9dk.fsf@Gertrud.fritz.box> <83fvdd612c.fsf@gnu.org> <87h9xttmwa.fsf@uwakimon.sk.tsukuba.ac.jp> <83oas13p1y.fsf@gnu.org> <87egsvu7iw.fsf@uwakimon.sk.tsukuba.ac.jp> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1416639082 16739 80.91.229.3 (22 Nov 2014 06:51:22 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 22 Nov 2014 06:51:22 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Nov 22 07:51:17 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Xs4XN-00027d-DJ for ged-emacs-devel@m.gmane.org; Sat, 22 Nov 2014 07:51:17 +0100 Original-Received: from localhost ([::1]:44056 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xs4XN-00017O-06 for ged-emacs-devel@m.gmane.org; Sat, 22 Nov 2014 01:51:17 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:56750) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xs4XA-00017E-Ne for emacs-devel@gnu.org; Sat, 22 Nov 2014 01:51:05 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xs4X9-0002Yt-LN for emacs-devel@gnu.org; Sat, 22 Nov 2014 01:51:04 -0500 Original-Received: from fely.am-1.org ([2a01:4f8:d15:1b86::2]:48033) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xs4X9-0002Su-Bw for emacs-devel@gnu.org; Sat, 22 Nov 2014 01:51:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=siamics.net; s=a2013295; h=Content-Transfer-Encoding:Content-Type:MIME-Version:Message-ID:In-Reply-To:Date:Sender:References:Subject:To:From; bh=xlOO5MP511K7uIUEMNR5XPdpE9HboNa1iB7cqYsZkkg=; b=KRucxObYecYmJR7I7Sg6g4qbjJLyzGVaJICXSn0Nu0NpYWke1fylFAN6Xc4XpMGZAXWHmbk0rliUYEJi4J+AxI8gNyxoss/MRT/JgTr0mbKPGzJRkozRim6kCnMI5WLZ8QHFWSiGlABVk1kbfIpBgugnJ/mlZJvCc5XRnKxataQ=; Original-Received: from [2a02:2560:6d4:26ca::1:1d] (helo=violet.siamics.net) by fely.am-1.org with esmtps (TLS1.2:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1Xs4X5-0000Jp-Hf for emacs-devel@gnu.org; Sat, 22 Nov 2014 06:51:00 +0000 Original-Received: from localhost ([::1] helo=violet.siamics.net) by violet.siamics.net with esmtps (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1Xs4Wy-0000hm-7R for emacs-devel@gnu.org; Sat, 22 Nov 2014 13:50:52 +0700 In-Reply-To: <87egsvu7iw.fsf@uwakimon.sk.tsukuba.ac.jp> (Stephen J. Turnbull's message of "Sat, 22 Nov 2014 14:30:15 +0900") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a01:4f8:d15:1b86::2 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:177969 Archived-At: >>>>> Stephen J Turnbull writes: [=E2=80=A6] > Technically speaking, it's not possible in git to merge between > clones, you have to fetch and then merge (=3D=3D pull). Not necessarily, =E2=80=93 you can just as well add the Git (or, rather, .git/objects) directory of your =E2=80=9Cother=E2=80=9D clone to your curr= ent=E2=80=99s .git/objects/info/alternates, which will make the other clone=E2=80=99s commits available for any operation =E2=80=93 including merge =E2=80=93 on= the current one. Like, say: $ cat < emacs-foo/.git/objects=20 ../../../emacs-bar/.git/objects ../../../emacs-qux/.git/objects /read/only/archives/git/emacs.git/objects $=20 If you do not care about the warning, you can even do this is in a cyclic manner: $ cat < emacs-bar/.git/objects=20 ../../../emacs-foo/.git/objects ../../../emacs-qux/.git/objects /read/only/archives/git/emacs.git/objects $=20 [=E2=80=A6] --=20 FSF associate member #7257 http://boycottsystemd.org/ =E2=80=A6 3013 B6A0= 230E 334A