[parisc-linux] linux-2.6.git: git-pull pb?

[James Bottomley]

On Sun, 2006-09-10 at 11:57 -0600, Grant Grundler wrote:
> The version of arch/parisc/kernel/time.c in the tree now is NOT
> the version I expected there. How should we fix that?
> Should I commit/push the version I expected?

Erm, well it's the one you pushed.  This is your original commit (still
in the tree, just no-longer part of the history)

http://git.parisc-linux.org/?p=linux-2.6.git;a=commit;h=4613c88f480834aaad5f7d5d00a1d55ec1a749a1

The blob there is identical to the one from the rebased commit I did:

http://git.parisc-linux.org/?p=linux-2.6.git;a=commit;h=ce69b7ebe08543fb064645be93e5b5ce58c52790

So whatever you wanted to push wasn't what you actually ended up putting
in the tree.

I'd say just commit the diff between what you have now and what we
currently have in the tree.

James