Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'es/worktree-add' into maint
author
Junio C Hamano
<gitster@pobox.com>
Wed, 4 Nov 2015 22:20:44 +0000
(14:20 -0800)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 4 Nov 2015 22:20:44 +0000
(14:20 -0800)
* es/worktree-add:
worktree: usage: denote <branch> as optional with 'add'
1
2
builtin/worktree.c
patch
|
diff1
|
diff2
|
blob
|
history
raw
|
combined
(merge:
fdca2be
ae9f274
)
diff --cc
builtin/worktree.c
index 71bb770f7a4b4b864efcbf4c3983bbd4a645f4e2,8d85a8bc11c568e7b28804e68b7d9434aa624997..33d2d3705afacfb49973141a546f281d871e8eb6
---
1
/
builtin/worktree.c
---
2
/
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
};