Merge branch 'maint-2.5' into maint-2.6

diff --git a/builtin/worktree.c b/builtin/worktree.c
index 71bb770f7a4b4b864efcbf4c3983bbd4a645f4e2..33d2d3705afacfb49973141a546f281d871e8eb6 100644 (file)
--- a/builtin/worktree.c
+++ b/builtin/worktree.c
@@ -10,7 +10,7 @@
 #include "refs.h"
 
 static const char * const worktree_usage[] = {
-       N_("git worktree add [<options>] <path> <branch>"),
+       N_("git worktree add [<options>] <path> [<branch>]"),
        N_("git worktree prune [<options>]"),
        NULL
 };