From: Harald Hanche-Olsen <hanche@math.ntnu.no>
To: emacs-devel@gnu.org
Subject: Re: Stash
Date: Mon, 06 Apr 2015 17:07:13 +0200 [thread overview]
Message-ID: <5522A121.2010005@math.ntnu.no> (raw)
In-Reply-To: <86zj6l5mvb.fsf@dod.no>
Steinar Bang wrote:
Good explanation, but …
> "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
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
themselves, but really, the merging and fetching behaviours are central
to how these branches work.
– Harald
next prev parent reply other threads:[~2015-04-06 15:07 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-05 17:42 Stash Richard Stallman
2015-04-05 18:31 ` Stash Steinar Bang
2015-04-05 18:38 ` Stash Eli Zaretskii
2015-04-06 5:50 ` Stash Richard Stallman
2015-04-06 6:37 ` Stash Steinar Bang
2015-04-06 7:35 ` Stash Eli Zaretskii
2015-04-06 7:57 ` Stash Eli Zaretskii
2015-04-07 19:31 ` Stash Stephen J. Turnbull
2015-04-08 5:28 ` Stash Eli Zaretskii
2015-04-06 5:50 ` Stash Richard Stallman
2015-04-06 6:50 ` Stash Steinar Bang
2015-04-06 6:55 ` Stash Eli Zaretskii
2015-04-06 11:25 ` Stash Mathias Megyei
2015-04-06 11:30 ` Stash Eli Zaretskii
2015-04-06 11:56 ` Stash Yuri Khan
2015-04-06 12:06 ` Stash João Távora
2015-04-06 12:25 ` Stash Eli Zaretskii
2015-04-06 12:19 ` Stash Eli Zaretskii
2015-04-06 11:59 ` Stash João Távora
2015-04-06 12:21 ` Stash Eli Zaretskii
2015-04-06 13:06 ` Stash João Távora
2015-04-06 6:55 ` Stash Eli Zaretskii
2015-04-06 14:53 ` Stash Steinar Bang
2015-04-06 15:07 ` Harald Hanche-Olsen [this message]
2015-04-06 18:48 ` Stash Steinar Bang
2015-04-06 5:51 ` Stash Richard Stallman
2015-04-06 7:29 ` Stash Eli Zaretskii
2015-04-06 7:55 ` Stash Harald Hanche-Olsen
2015-04-07 16:13 ` Stash Richard Stallman
2015-04-07 16:48 ` Stash Eli Zaretskii
2015-04-07 19:51 ` Stash Stephen J. Turnbull
2015-04-08 18:20 ` Stash Richard Stallman
2015-04-08 18:21 ` Stash Richard Stallman
2015-04-08 18:33 ` Stash Eli Zaretskii
2015-04-09 13:16 ` Stash Richard Stallman
2015-04-09 13:45 ` Stash Eli Zaretskii
2015-04-10 10:57 ` Stash Richard Stallman
2015-04-08 18:21 ` Stash Richard Stallman
2015-04-07 16:58 ` Stash Andreas Schwab
2015-04-08 18:21 ` Stash Richard Stallman
2015-04-09 17:07 ` Stash Andreas Schwab
2015-04-10 10:58 ` Stash Richard Stallman
2015-04-07 20:12 ` Stash Stephen J. Turnbull
2015-04-09 13:16 ` Stash Richard Stallman
2015-04-09 16:53 ` Stash Stephen J. Turnbull
2015-04-10 10:58 ` Stash Richard Stallman
2015-04-10 11:18 ` Stash Eli Zaretskii
2015-04-10 13:52 ` Stash Stephen J. Turnbull
2015-04-05 18:40 ` Stash Paul Eggert
2015-04-05 19:25 ` Stash Harald Hanche-Olsen
2015-04-05 19:59 ` Stash Paul Eggert
2015-04-05 19:26 ` Stash Steinar Bang
2015-04-05 20:18 ` Stash Stephen J. Turnbull
2015-04-05 19:41 ` Stash Harald Hanche-Olsen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5522A121.2010005@math.ntnu.no \
--to=hanche@math.ntnu.no \
--cc=emacs-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).