From: John Hendy <jw.hendy@gmail.com>
To: emacs-orgmode <emacs-orgmode@gnu.org>
Subject: Proper git settings to stay with master?
Date: Thu, 22 Dec 2016 10:44:59 -0600 [thread overview]
Message-ID: <CA+M2ft_KDryS-9azGe2QyFHBqF5kj+VQZc6_H=7K3t5f77nG-Q@mail.gmail.com> (raw)
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
next reply other threads:[~2016-12-22 16:45 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-22 16:44 John Hendy [this message]
2016-12-23 11:24 ` Proper git settings to stay with master? Achim Gratz
2016-12-23 19:49 ` John Hendy
2016-12-24 11:15 ` Achim Gratz
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.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CA+M2ft_KDryS-9azGe2QyFHBqF5kj+VQZc6_H=7K3t5f77nG-Q@mail.gmail.com' \
--to=jw.hendy@gmail.com \
--cc=emacs-orgmode@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/org-mode.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).