From mboxrd@z Thu Jan  1 00:00:00 1970
From: John Hendy <jw.hendy@gmail.com>
Subject: Re: Proper git settings to stay with master?
Date: Fri, 23 Dec 2016 13:49:14 -0600
Message-ID: <CA+M2ft8JAAk+fM30yOdzFB0GbLzPsLuTioLshQS89HmnbGy-jg@mail.gmail.com>
References: <CA+M2ft_KDryS-9azGe2QyFHBqF5kj+VQZc6_H=7K3t5f77nG-Q@mail.gmail.com>
	<o3j1hi$dfu$1@blaine.gmane.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:55800)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jw.hendy@gmail.com>) id 1cKVq9-0005hJ-27
	for emacs-orgmode@gnu.org; Fri, 23 Dec 2016 14:49:17 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jw.hendy@gmail.com>) id 1cKVq8-0002Qa-0O
	for emacs-orgmode@gnu.org; Fri, 23 Dec 2016 14:49:17 -0500
Received: from mail-ua0-x22d.google.com ([2607:f8b0:400c:c08::22d]:34066)
	by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
	(Exim 4.71) (envelope-from <jw.hendy@gmail.com>) id 1cKVq7-0002Q5-SX
	for emacs-orgmode@gnu.org; Fri, 23 Dec 2016 14:49:15 -0500
Received: by mail-ua0-x22d.google.com with SMTP id 34so80898144uac.1
	for <emacs-orgmode@gnu.org>; Fri, 23 Dec 2016 11:49:15 -0800 (PST)
In-Reply-To: <o3j1hi$dfu$1@blaine.gmane.org>
List-Id: "General discussions about Org-mode." <emacs-orgmode.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/emacs-orgmode/>
List-Post: <mailto:emacs-orgmode@gnu.org>
List-Help: <mailto:emacs-orgmode-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=subscribe>
Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
Sender: "Emacs-orgmode"
	<emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
To: Achim Gratz <Stromeko@nexgo.de>
Cc: emacs-orgmode <emacs-orgmode@gnu.org>

On Fri, Dec 23, 2016 at 5:24 AM, Achim Gratz <Stromeko@nexgo.de> wrote:
> Am 22.12.2016 um 17:44 schrieb John Hendy:
>>
>> $ git pull
>> From http://orgmode.org/org-mode
>>    13751c3249..820d1eb617  maint      -> origin/maint
>>    7fd61c4f92..1c89082600  master     -> origin/master
>> You are not currently on a branch.
>
>
> Well, then you want to do a
>
> git checkout master

Sure... I get that that I *can* do that. I just wondered why I
*needed* to do that.

>
> or
>
> git checkout maint
>
> depending on which branch you want to be on.
>
>> Have I botched something? If so, what would be the method to remedy?
>> If not, what should be updated in the instructions regarding sticking
>> with master? I see references on how to specify maint, but that seems
>> to imply that master is the default and action is only required to
>> override to use maint branch.
>
>
> Master _is_ the default, so you must have specifically checked out a commit
> not at the branch HEAD or left a bisect or similar command that replays
> history hanging unfinished somewhere.
>

This makes sense. I don't know why this never happened before, but
checking out a specific commit makes sense. Perhaps I was bisecting
something in the past and checking out various commits? Once you check
out *something*, do you always have to re-checkout something else to
undo this effect (and make it like the default)? As in if I check out
a commit and then =git pull=, it won't go back to master?


Thanks for clarifying/educating!
John

> --
> Achim.
>
> (on the road :-)
>
>