From mboxrd@z Thu Jan  1 00:00:00 1970
From: John Hendy <jw.hendy@gmail.com>
Subject: Proper git settings to stay with master?
Date: Thu, 22 Dec 2016 10:44:59 -0600
Message-ID: <CA+M2ft_KDryS-9azGe2QyFHBqF5kj+VQZc6_H=7K3t5f77nG-Q@mail.gmail.com>
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]:56821)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jw.hendy@gmail.com>) id 1cK6UH-0001Ss-JL
	for emacs-orgmode@gnu.org; Thu, 22 Dec 2016 11:45:02 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jw.hendy@gmail.com>) id 1cK6UG-0004kP-DH
	for emacs-orgmode@gnu.org; Thu, 22 Dec 2016 11:45:01 -0500
Received: from mail-ua0-x22d.google.com ([2607:f8b0:400c:c08::22d]:34312)
	by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
	(Exim 4.71) (envelope-from <jw.hendy@gmail.com>) id 1cK6UG-0004kD-95
	for emacs-orgmode@gnu.org; Thu, 22 Dec 2016 11:45:00 -0500
Received: by mail-ua0-x22d.google.com with SMTP id 34so50717042uac.1
	for <emacs-orgmode@gnu.org>; Thu, 22 Dec 2016 08:45:00 -0800 (PST)
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 <emacs-orgmode@gnu.org>

I've not encountered this issue before, but on a git pull last night I
was greeted with a message like this (I don't have the original which
listed several other branches):

$ 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.
Please specify which branch you want to merge with.
See git-pull(1) for details.

    git pull <remote> <branch>


I just tried =make up0= and get something similar:

$ make up0
rm -f
git checkout
git remote update
Fetching origin
git pull
You are not currently on a branch.
Please specify which branch you want to merge with.
See git-pull(1) for details.

    git pull <remote> <branch>

make: *** [mk/targets.mk:113: up0] Error 1


I don't see anything about this in the FAQ about keeping up to date,
just what I would have done ages ago with a simple =git clone=.[1]

Here's my ~/.elisp/org/.git/config:

$ cat .git/config
[core]
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
[remote "origin"]
url = http://orgmode.org/org-mode.git
fetch = +refs/heads/*:refs/remotes/origin/*
[branch "master"]
remote = origin
merge = refs/heads/master


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.


Thanks,
John

[1] http://orgmode.org/worg/org-faq.html#keeping-current-with-Org-mode-development