From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Harald Hanche-Olsen Newsgroups: gmane.emacs.devel Subject: Re: Stash Date: Mon, 06 Apr 2015 17:07:13 +0200 Message-ID: <5522A121.2010005@math.ntnu.no> References: <86sice77h0.fsf@dod.no> <86fv8d7ntk.fsf@dod.no> <86zj6l5mvb.fsf@dod.no> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1428332870 13726 80.91.229.3 (6 Apr 2015 15:07:50 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 6 Apr 2015 15:07:50 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Apr 06 17:07:43 2015 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 1Yf8co-0003Q9-Hz for ged-emacs-devel@m.gmane.org; Mon, 06 Apr 2015 17:07:42 +0200 Original-Received: from localhost ([::1]:40487 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yf8cn-0003He-O9 for ged-emacs-devel@m.gmane.org; Mon, 06 Apr 2015 11:07:41 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:56470) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yf8cW-0003HW-LX for emacs-devel@gnu.org; Mon, 06 Apr 2015 11:07:28 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yf8cQ-0006Rl-Vw for emacs-devel@gnu.org; Mon, 06 Apr 2015 11:07:24 -0400 Original-Received: from hylle06.itea.ntnu.no ([129.241.56.235]:42848) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yf8cQ-0006RZ-PC for emacs-devel@gnu.org; Mon, 06 Apr 2015 11:07:18 -0400 Original-Received: from localhost (localhost [127.0.0.1]) by hylle06.itea.ntnu.no (Postfix) with ESMTP id 4126E66ACEF for ; Mon, 6 Apr 2015 17:07:17 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at hylle06.itea.ntnu.no Original-Received: from [IPv6:2001:4662:4ffb::c35:78d:c6ff:48e4] (unknown [IPv6:2001:4662:4ffb:0:c35:78d:c6ff:48e4]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: hanche) by hylle06.itea.ntnu.no (Postfix) with ESMTPSA id B2A40661011; Mon, 6 Apr 2015 17:07:14 +0200 (CEST) User-Agent: Postbox 3.0.11 (Macintosh/20140602) In-Reply-To: <86zj6l5mvb.fsf@dod.no> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 129.241.56.235 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:185041 Archived-At: Steinar Bang wrote: Good explanation, but =E2=80=A6 > "origin/master" and "master" are actually files: > .git/refs/heads/master > .git/refs/remotes/origin/master > > Inside the files is a sha1 hash uniquely defining a commit. They are more than that. There is also behaviour associated with these=20 branches found in the configuration: ; git config --get-regexp '^branch.master' branch.master.remote origin branch.master.merge refs/heads/master ; git config --get-regexp '^remote.origin' remote.origin.url git://git.savannah.gnu.org/emacs.git remote.origin.fetch +refs/heads/*:refs/remotes/origin/* ; (Or just look into .git/config.) I suppose that you can argue that this is external to the branches=20 themselves, but really, the merging and fetching behaviours are central=20 to how these branches work. =E2=80=93 Harald