From mboxrd@z Thu Jan  1 00:00:00 1970
From: Achim Gratz <Stromeko@Nexgo.DE>
Subject: Re: Proper git settings to stay with master?
Date: Fri, 23 Dec 2016 12:24:37 +0100
Message-ID: <o3j1hi$dfu$1@blaine.gmane.org>
References: <CA+M2ft_KDryS-9azGe2QyFHBqF5kj+VQZc6_H=7K3t5f77nG-Q@mail.gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 7bit
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:45138)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <geo-emacs-orgmode@m.gmane.org>) id 1cKNy7-0000x4-NM
	for emacs-orgmode@gnu.org; Fri, 23 Dec 2016 06:25:00 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <geo-emacs-orgmode@m.gmane.org>) id 1cKNy2-0005NZ-R9
	for emacs-orgmode@gnu.org; Fri, 23 Dec 2016 06:24:59 -0500
Received: from [195.159.176.226] (port=50049 helo=blaine.gmane.org)
	by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
	(Exim 4.71) (envelope-from <geo-emacs-orgmode@m.gmane.org>)
	id 1cKNy2-0005N9-5X
	for emacs-orgmode@gnu.org; Fri, 23 Dec 2016 06:24:54 -0500
Received: from list by blaine.gmane.org with local (Exim 4.84_2)
	(envelope-from <geo-emacs-orgmode@m.gmane.org>) id 1cKNxs-0004sI-R1
	for emacs-orgmode@gnu.org; Fri, 23 Dec 2016 12:24:44 +0100
In-Reply-To: <CA+M2ft_KDryS-9azGe2QyFHBqF5kj+VQZc6_H=7K3t5f77nG-Q@mail.gmail.com>
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: emacs-orgmode@gnu.org

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

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.

-- 
Achim.

(on the road :-)