Merge branch 'jc/lockfile' into next

diff --git a/rsh.c b/rsh.c
index 64c48091cb32af1d8c5b2ec145ad660ab9f0a75f..d66526941fbe45f99e51babc2c55a63b4baa027c 100644 (file)
--- a/rsh.c
+++ b/rsh.c
@@ -68,7 +68,7 @@ int setup_connection(int *fd_in, int *fd_out, const char *remote_prog,
        if (!path) {
                return error("Bad URL: %s", url);
        }
-       /* $GIT_RSH <host> "env GIR_DIR=<path> <remote_prog> <args...>" */
+       /* $GIT_RSH <host> "env GIT_DIR=<path> <remote_prog> <args...>" */
        sizen = COMMAND_SIZE;
        posn = command;
        of = 0;