emacs-devel
[Top][All Lists]
Advanced

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

Re: Obscure error/warning/information message from git pull


From: David Kastrup
Subject: Re: Obscure error/warning/information message from git pull
Date: Tue, 18 Nov 2014 19:40:51 +0100
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux)

Eli Zaretskii <address@hidden> writes:

> Regardless, the concept of "branch" as a separate line of development
> is not killed by Git.  It's just that a branch can be named by its
> tip, and vice versa.

A local branch is slightly more than its tip: you can be "on" a branch,
and if you commit then, the tip is advanced.  In contrast, a
remote-mirroring branch is indeed not more than its tip: checking it out
gives you a detached HEAD.  Committing does not change the branch tip.

Being "on" a branch also implies some defaults for actions like pushing,
pulling, rebasing, merging, committing.

But this "extra branchiness" only applies to branch heads.  Indeed, if
you write master^0 instead of master, the branchiness is already gone:
master^0 is not associated with the master branch specially in any way.
It's just the same as a naked commit id.

-- 
David Kastrup




reply via email to

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