diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-06-29 16:41:55 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-06-29 16:41:55 -0700 |
| commit | f5cfd52f7b85d693b3782297819981a502a0135b (patch) | |
| tree | 18ee132a84ab97f275a35b595b6a713611861f6f /builtin | |
| parent | f696543dad6c7ba27b0c4fab167a5687263a9ba0 (diff) | |
| parent | b586744a864cf4d6886d6436d559302123b01fae (diff) | |
| download | git-f5cfd52f7b85d693b3782297819981a502a0135b.tar.gz | |
Merge branch 'maint-1.7.5' into maint
* maint-1.7.5:
test: skip clean-up when running under --immediate mode
"branch -d" can remove more than one branches
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/branch.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/branch.c b/builtin/branch.c index d6ab93bfbb..3142daa57a 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -19,7 +19,7 @@ static const char * const builtin_branch_usage[] = { "git branch [options] [-r | -a] [--merged | --no-merged]", "git branch [options] [-l] [-f] <branchname> [<start-point>]", - "git branch [options] [-r] (-d | -D) <branchname>", + "git branch [options] [-r] (-d | -D) <branchname>...", "git branch [options] (-m | -M) [<oldbranch>] <newbranch>", NULL }; |