Re: CM 1.1 git question

[Johannes Schindelin]

Hi,

On Fri, 20 Feb 2009, Jonathan Kulp wrote:

> Trevor Daniels wrote:
> 
> > More seriously, the patch doesn't apply here because
> > your line numbering seems to be 1 off from the line
> > numbers I have in git-starting.itexi.  I have no idea
> > why that should be.  I believe my git repo is fully
> > synch'ed with origin/master, and according to your
> > description of the method you used to create the patch
> > yours should be too.  The line you are changing is
> > numbered 229, not 230, in my copy.
> 
> Weird.  I do this command to sync up:
> 
> git pull origin
> 
> Is this right?  I surmise that this pulls down more code than strictly 
> necessary for working on docs, but I don't mind having the extra code. 
> Maybe I should delete the whole directory and do a fresh clone.

If I understand correctly, Graham made a recipe that will only pull down 
the necessary changes.

> > I have the exact point in the repo where the change
> > was made.  You can get the committish with the command
> > git log -n1
> > 
> Here's the output of git log -n1:
> 
> commit b0796ff1c05ab4369275ef336e1581a77538add4
> Author: Jonathan Kulp <address@hidden(none)>
> Date:   Wed Feb 18 12:26:02 2009 -0600
> 
>     Fixed typo: "lastest" to "latest"
> 
> It really might be simpler for me just to get a fresh clone of the repo 
> to start with now that I've gotten a few git commands under my belt. I'd 
> rather be working on stuff than tracking down line-number problems. :)

No need to reclone.  Just rename the current branch:

        $ git branch -m old.branch

And then start anew (in the same repository!):

        $ git checkout -t origin/web

(You need to adjust the "web" to the appropriate branch name.)


Voila, you are at the same revision as upstream.

Now you can even reapply your "lastest" commit :-)

        $ git cherry-pick old.branch

(I used "old.branch" as a short cut to refer to the commit which is the 
tip of said branch.)

Ciao,
Dscho