Subject: Re: [SM-Commit] GIT changes to master grimoire by George Sherwood (830c429b2e39bf413d49cb95676897f3c1ab674a)
Date: Thu, 8 May 2008 19:55:34 +0500
On Thu, 8 May 2008 10:08:50 -0500
George Sherwood <scm AT sourcemage.org> wrote:
> GIT changes to master grimoire by George Sherwood
> <gsherwood AT sourcemage.org>:
>
> graphics-libs/libpng/DEPENDS | 3 ---
> graphics-libs/libpng/HISTORY | 4 ++++
> graphics-libs/libpng/PRE_BUILD | 2 --
> 3 files changed, 4 insertions(+), 5 deletions(-)
>
> New commits:
> commit 830c429b2e39bf413d49cb95676897f3c1ab674a
> Author: George Sherwood <gsherwood AT sourcemage.org>
> Commit: George Sherwood <gsherwood AT sourcemage.org>
>
> libpng: Problem with autotools is fixed. No longer
> need to reconfigure. Removed from PRE_BUILD and removed
> extra depends. Also apng patch works.
>
This is a first for me. I have never seen to commits go like this. I
have problems with my git now and am not sure how to fix. I tried a
git checkout -f and get:
orge@test:/extra/grimoire$ git checkout -f
Your branch and the tracked remote branch 'origin/master' have diverged,
and respectively have 1 and 1 different commit(s) each.