From: Jakub Narebski Date: Fri, 08 Dec 2006 21:44:08 GMT Subject: Re: [PATCH] rerere: record (or avoid misrecording) resolved, skipped or aborted rebase/am Message-ID: In-Reply-To: <1165613397460-git-send-email-normalperson@yhbt.net> 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? -- Jakub Narebski Warsaw, Poland ShadeHawk on #git