Re: [PATCH] rerere: record (or avoid misrecording) resolved, skipped or aborted rebase/am

From: Eric Wong <normalperson@yhbt.net>
Date: Dec 8, 2006, 21:50 UTC
Message-ID: <20061208215021.GA28018@localdomain>
In-Reply-To: <elcm6u$l8t$1@sea.gmane.org>

Jakub Narebski <jnareb@gmail.com> wrote:

Show 22 quoted lines

> Eric Wong wrote:
> 
> Just one comment:
> 
> > +       if test -d "$GIT_DIR/rr-cache"
> > +       then
> > +               git-rerere clear
> > +       fi
> >         this=`expr "$this" + 1`
> >         resume=
> >  fi
> > @@ -408,6 +412,10 @@ do
> >                         stop_here_user_resolve $this
> >                 fi
> >                 apply_status=0
> > +               if test -d "$GIT_DIR/rr-cache"
> > +               then
> > +                       git rerere
> > +               fi
> 
> Why do you use once "git-rerere", and another time "git rerere"?
> Shouldn't scripts always use git-command form?

Yes.  Or at least I remember git-command form being preferred.

I don't think I've been entirely consistent in the things I've written, and my shell history is just as inconsistent :x