[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [O] Proper git settings to stay with master?
From: |
John Hendy |
Subject: |
Re: [O] Proper git settings to stay with master? |
Date: |
Fri, 23 Dec 2016 13:49:14 -0600 |
On Fri, Dec 23, 2016 at 5:24 AM, Achim Gratz <address@hidden> 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 :-)
>
>