Jakub Narebski <jnareb@xxxxxxxxx> wrote: > 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 -- Eric Wong - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html