[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [O] Links in tables and LaTeX export
From: |
Nick Dokos |
Subject: |
Re: [O] Links in tables and LaTeX export |
Date: |
Tue, 05 Jul 2011 19:46:21 -0400 |
Bernt Hansen <address@hidden> wrote:
> Assuming his has local commits buried in his history somewhere Tom can
> 'fix' it by doing
>
> $ git checkout master
> $ git reset --hard origin/master
> $ git cherry-pick <whatever local commits he wants to keep>
>
> so the new commits are on top of origin/master, and set his master
> branch to automatically rebase on pulls as described in the link above.
>
Yup, now that you mention it, I think the first two steps is how I recovered
(I try to keep a pristine master and do local work in branches, but I
must have goofed up my master branch in that instance).
Thanks,
Nick
- Re: [O] Links in tables and LaTeX export, (continued)
- Re: [O] Links in tables and LaTeX export, Nick Dokos, 2011/07/04
- Re: [O] Links in tables and LaTeX export, Nicolas Goaziou, 2011/07/05
- Re: [O] Links in tables and LaTeX export, Nick Dokos, 2011/07/05
- Re: [O] Links in tables and LaTeX export, Thomas S. Dye, 2011/07/05
- Re: [O] Links in tables and LaTeX export, Nick Dokos, 2011/07/05
- Re: [O] Links in tables and LaTeX export, Bernt Hansen, 2011/07/05
- Re: [O] Links in tables and LaTeX export, Nick Dokos, 2011/07/05
- Re: [O] Links in tables and LaTeX export, Bernt Hansen, 2011/07/05
- Re: [O] Links in tables and LaTeX export,
Nick Dokos <=
- Re: [O] Links in tables and LaTeX export, Thomas S. Dye, 2011/07/05