Re: re-running merge on a single file

[Chris Packham <judge.packham@gmail.com>]

Hi,

On Thu, Mar 11, 2010 at 3:20 PM, Jakub Narebski <jnareb@gmail.com> wrote:
>
> First, instead of 'git cat-file blob <blob-id>' you can simply use
> 'git show <blob-id>'.
>
> Second, while in
>
>  $ git checkout --merge -- cpu/mpc83xx/start.S
>
> the path cpu/mpc83xx/start.S is relative to your current directory,
> in
>
>  $ git show :1:cpu/mpc83xx/start.S > start.S.base
>
> the path has to be "absolute path in repository", i.e. path relative
> to top directory of the repository.

 That is the path from the top directory (its a u-boot repository).

>
> Try
>
>  $ git show :1:$(git rev-parse --show-prefix)cpu/mpc83xx/start.S \
>    > cpu/mpc83xx/start.S.base

git show doesn't complain about the path. But I'm obviously not
setting the stage correctly

$ git checkout --merge -- cpu/mpc83xx/start.S
$ git show :1:$(git rev-parse --show-prefix)cpu/mpc83xx/start.S
fatal: Path 'cpu/mpc83xx/start.S' is in the index, but not at stage 1.
Did you mean ':0:cpu/mpc83xx/start.S'?

By now I have additional commits that touch cpu/mpc83xx/start.S so
I'll see if I can find a file that I haven't touched since the merge.