From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 4 Nov 2015 22:20:44 +0000 (-0800)
Subject: Merge branch 'es/worktree-add' into maint
X-Git-Tag: v2.6.3~15
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d091031ce2d6bf8a8e9bc4d16acf426449c62a68

Merge branch 'es/worktree-add' into maint

* es/worktree-add:
worktree: usage: denote <branch> as optional with 'add'
---

d091031ce2d6bf8a8e9bc4d16acf426449c62a68
diff --cc builtin/worktree.c
index 71bb770f7a,8d85a8bc11..33d2d3705a
--- a/builtin/worktree.c
+++ b/builtin/worktree.c
@@@ -3,14 -3,11 +3,14 @@@
  #include "dir.h"
  #include "parse-options.h"
  #include "argv-array.h"
 +#include "branch.h"
 +#include "refs.h"
  #include "run-command.h"
  #include "sigchain.h"
 +#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
  };