headers
Lars Ingebrigtsen | 1 Feb 2012 02:16
Picon
Favicon
Gravatar

Re: New branch for No Gnus

Lars Ingebrigtsen <larsi <at> gnus.org> writes:

>> To undo the damange, you can do "git revert -m 2 HEAD" on the no-gnus
>> branch.
>
> Great!  I'll do that...

Just to be totally sure I'm not screwing anything up:  Should I do a
"git pull" in my local No Gnus tree before saying "git revert -m 2
HEAD", and then pushing out, or should I just do the revert without
pulling from git.gnus.org first?

--

-- 
(domestic pets only, the antidote for overdose, milk.)
  http://lars.ingebrigtsen.no  *  Sent from my Rome
Permalink | Reply |
headers
Steinar Bang | 1 Feb 2012 10:10
Picon
Picon
Favicon

Re: New branch for No Gnus

>>>>> Lars Ingebrigtsen <larsi <at> gnus.org>:

> Just to be totally sure I'm not screwing anything up:  Should I do a
> "git pull" in my local No Gnus tree before saying "git revert -m 2
> HEAD", and then pushing out, or should I just do the revert without
> pulling from git.gnus.org first?

I assume that this is the fix to the messup that was mentioned earlier
in the thread?

I've never used git-revert myself, but I would have done it this way:
 git checkout no-gnus
 git revert -m 2 HEAD
 git push -f origin HEAD

I could try to explain the logic behind this...?  Or I could just mention
chapter 3 of "Pro Git" again...:-)

Briefly:
  - if you do "git branch" you will see all local branches in your git
    repository.
  - If you do "git branch -a" you will see more branches, some with
    "remotes/origin/" in front of them.
  - All local branches exist only in your local .git directory (they do
    not exist upstream (though for tracking branches (mentioned later)
    that is a question of semantics...))
  - You can only check out and work on a local branch
  - Some local branches have a special relationship with a remote
    branch.  These local branches are called "tracking branches".  In
    your case, no-gnus and master are tracking branches
(Continue reading)

Permalink | Reply |
headers
Lars Ingebrigtsen | 1 Feb 2012 14:19
Picon
Favicon
Gravatar

Re: New branch for No Gnus

Steinar Bang <sb <at> dod.no> writes:

> I could try to explain the logic behind this...?  Or I could just mention
> chapter 3 of "Pro Git" again...:-)
>
> Briefly:

Thanks for the explanation.  It's now slightly clearer in my mind.  :-)

--

-- 
(domestic pets only, the antidote for overdose, milk.)
  http://lars.ingebrigtsen.no  *  Sent from my Rome
Permalink | Reply |
headers
Andreas Schwab | 1 Feb 2012 12:31

Re: New branch for No Gnus

Lars Ingebrigtsen <larsi <at> gnus.org> writes:

> Lars Ingebrigtsen <larsi <at> gnus.org> writes:
>
>>> To undo the damange, you can do "git revert -m 2 HEAD" on the no-gnus
>>> branch.
>>
>> Great!  I'll do that...
>
> Just to be totally sure I'm not screwing anything up:  Should I do a
> "git pull" in my local No Gnus tree before saying "git revert -m 2
> HEAD", and then pushing out, or should I just do the revert without
> pulling from git.gnus.org first?

You always need to pull first, since the server will not allow
non-fast-forward pushes.

Andreas.

--

-- 
Andreas Schwab, schwab <at> linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."
Permalink | Reply |
headers
Lars Ingebrigtsen | 1 Feb 2012 14:03
Picon
Favicon
Gravatar

Re: New branch for No Gnus

Andreas Schwab <schwab <at> linux-m68k.org> writes:

> You always need to pull first, since the server will not allow
> non-fast-forward pushes.

Right.  I went ahead and did that, and things look OK now.  I think.

--

-- 
(domestic pets only, the antidote for overdose, milk.)
  http://lars.ingebrigtsen.no  *  Sent from my Rome
Permalink | Reply |

Gmane