diff options
| author | Denton Liu <liu.denton@gmail.com> | 2020-06-15 14:53:20 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-06-17 21:12:34 +0300 |
| commit | dc44639904c9a0899854c79c97c248f3d3cc2bdc (patch) | |
| tree | b4d15582346fe07c6aece8a09d057b39f76cbeae | |
| parent | 6b7093064a8db318bb18272a064590d558998dbf (diff) | |
branch: don't mix --edit-description
`git branch` accepts `--edit-description` in conjunction with other
arguments. However, `--edit-description` is its own mode, similar to
`--set-upstream-to`, which is also made mutually exclusive with other
modes. Prevent `--edit-description` from being mixed with other modes.
Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -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 d8297f80ff..1263eb2797 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -695,7 +695,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) |