| commit | 3821eb6c3dedba1c57522a1254a916f5ad0d15dc | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 19 Jul 2023 13:37:39 +0000 (19 06:37 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 20 Jul 2023 05:02:53 +0000 (19 22:02 -0700) | ||
| tree | 8b7e512474231c28e77df75fca02b246a44a115a | treesnapshot (tar.gz zip) |
| parent | fb7d80edcae482f4fa5d4be0227dc3054734e5f3 | commitdiff |
reset: reject --no-(mixed|soft|hard|merge|keep) option
"git reset --no-mixed" behaved exactly like "git reset --mixed",
which was nonsense.
If there were only two kinds, e.g. "mixed" vs "separate", it might
have made sense to make "git reset --no-mixed" behave identically to
"git reset --separate" and vice-versa, but because we have many
types of reset, let's just forbid "--no-mixed" and negated form of
other types.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
"git reset --no-mixed" behaved exactly like "git reset --mixed",
which was nonsense.
If there were only two kinds, e.g. "mixed" vs "separate", it might
have made sense to make "git reset --no-mixed" behave identically to
"git reset --separate" and vice-versa, but because we have many
types of reset, let's just forbid "--no-mixed" and negated form of
other types.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin/reset.c | diffblobblamehistory | |
| t/t7102-reset.sh | diffblobblamehistory |