From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 26 Oct 2015 22:55:21 +0000 (-0700)
Subject: Merge branch 'es/worktree-add'
X-Git-Tag: v2.7.0-rc0~77
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=522e2f4515c4157c445fa49ed2a920f19711d5d9;p=git

Merge branch 'es/worktree-add'

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

522e2f4515c4157c445fa49ed2a920f19711d5d9
diff --cc builtin/worktree.c
index 78d26902a6,8d85a8bc11..d281f6d887
--- a/builtin/worktree.c
+++ b/builtin/worktree.c
@@@ -3,18 -3,12 +3,18 @@@
  #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"
 +#include "utf8.h"
 +#include "worktree.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>]"),
 +	N_("git worktree list [<options>]"),
  	NULL
  };