Re: master^ is not a local branch -- huh?!?
On Fri, 29 Jan 2010 14:47:49 -0800, Ron Garret <ron1@flownet.com> wrote:
> My actual use case is very complicated, but here's a simplified version:
>
> Suppose I'm using git as a back-end for a wiki. I want to look at the
> state of the entire wiki as it was in some point in the past, and I also
> want to be able to look at the diffs between individual pages as they
> were then and as they are now. The most straightforward way I can think
Show 11 quoted lines
> of to do that is to simply copy an old commit into my working tree
> without changing anything else. Then I can look at the old version by
> simply looking at the files, and I can get the diffs by simply doing a
> git diff.
>
> If I do a git reset --hard then I get the old version, but I lose my
> HEAD pointer so that git diff doesn't give me what I want any more.
>
> BTW, it turns out that git checkout [commit] . doesn't do the right
> thing either. Apparently, it still updates my index, so git diff still
> doesn't do the right thing.
If I understand what you want correctly, then:
git diff --cached -R [path]
should be the appropriate command after the "git checkout <commit> .".
--
Julian
Julian Phillips <julian@quantumfyre.co.uk>