diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-06-25 12:27:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-06-25 12:27:47 -0700 |
| commit | 7b2685ef2d637de333765f5406d36799894c9a38 (patch) | |
| tree | b97772910a8383f97de80d0c671cf9ddcde12039 /builtin | |
| parent | Merge branch 'cc/upload-pack-data-3' (diff) | |
| parent | branch: don't mix --edit-description (diff) | |
| download | tgif-7b2685ef2d637de333765f5406d36799894c9a38.tar.xz | |
Merge branch 'dl/branch-cleanup'
Code clean-up around "git branch" with a minor bugfix.
* dl/branch-cleanup:
branch: don't mix --edit-description
t3200: test for specific errors
t3200: rename "expected" to "expect"
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 accb61b1aa..99633ad004 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -693,7 +693,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix) list = 1; if (!!delete + !!rename + !!copy + !!new_upstream + !!show_current + - list + unset_upstream > 1) + list + edit_description + unset_upstream > 1) usage_with_options(builtin_branch_usage, options); if (filter.abbrev == -1) |