From: Achim Gratz <Stromeko@Nexgo.DE>
To: emacs-orgmode@gnu.org
Subject: Re: Proper git settings to stay with master?
Date: Fri, 23 Dec 2016 12:24:37 +0100 [thread overview]
Message-ID: <o3j1hi$dfu$1@blaine.gmane.org> (raw)
In-Reply-To: <CA+M2ft_KDryS-9azGe2QyFHBqF5kj+VQZc6_H=7K3t5f77nG-Q@mail.gmail.com>
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 :-)
next prev parent reply other threads:[~2016-12-23 11:25 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-22 16:44 Proper git settings to stay with master? John Hendy
2016-12-23 11:24 ` Achim Gratz [this message]
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='o3j1hi$dfu$1@blaine.gmane.org' \
--to=stromeko@nexgo.de \
--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).