From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: git commit/push and VC Date: Sat, 22 Nov 2014 10:36:47 +0200 Message-ID: <8361e7tyw0.fsf@gnu.org> 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> <87k32nwwxg.fsf@violet.siamics.net> Reply-To: Eli Zaretskii 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 1416645440 32765 80.91.229.3 (22 Nov 2014 08:37:20 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 22 Nov 2014 08:37:20 +0000 (UTC) Cc: emacs-devel@gnu.org To: Ivan Shmakov Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Nov 22 09:37:08 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 1Xs6Bm-0002IW-JC for ged-emacs-devel@m.gmane.org; Sat, 22 Nov 2014 09:37:06 +0100 Original-Received: from localhost ([::1]:44383 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xs6Bm-0003yW-1B for ged-emacs-devel@m.gmane.org; Sat, 22 Nov 2014 03:37:06 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:39351) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xs6Bc-0003yD-N7 for emacs-devel@gnu.org; Sat, 22 Nov 2014 03:37:03 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xs6BR-0004u6-8P for emacs-devel@gnu.org; Sat, 22 Nov 2014 03:36:56 -0500 Original-Received: from mtaout25.012.net.il ([80.179.55.181]:33176) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xs6BQ-0004ty-W2 for emacs-devel@gnu.org; Sat, 22 Nov 2014 03:36:45 -0500 Original-Received: from conversion-daemon.mtaout25.012.net.il by mtaout25.012.net.il (HyperSendmail v2007.08) id <0NFF00600M4F2200@mtaout25.012.net.il> for emacs-devel@gnu.org; Sat, 22 Nov 2014 10:32:21 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout25.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NFF002XPMDX7G30@mtaout25.012.net.il>; Sat, 22 Nov 2014 10:32:21 +0200 (IST) In-reply-to: <87k32nwwxg.fsf@violet.siamics.net> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 80.179.55.181 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:177975 Archived-At: > From: Ivan Shmakov > Date: Sat, 22 Nov 2014 06:50:51 +0000 >=20 > > Technically speaking, it's not possible in git to merge between > > clones, you have to fetch and then merge (=3D=3D pull). >=20 > =09Not necessarily, =E2=80=93 you can just as well add the Git (or,= rather, > =09.git/objects) directory of your =E2=80=9Cother=E2=80=9D clone to= your current=E2=80=99s > =09.git/objects/info/alternates, which will make the other clone= =E2=80=99s > =09commits available for any operation =E2=80=93 including merge = =E2=80=93 on the > =09current one. Like, say: >=20 > $ cat < emacs-foo/.git/objects=20 > ../../../emacs-bar/.git/objects > ../../../emacs-qux/.git/objects > /read/only/archives/git/emacs.git/objects I don't think it's a good idea to recommend anything like that to people who use Git for a short time, who are the main audience for th= e Wiki recommendations.