| commit | 17d6c744dc0d5ed4cd0f228da14239ea2654f05b | |
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | |
| Tue, 21 Mar 2017 12:58:49 +0000 (21 12:58 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 21 Mar 2017 18:19:52 +0000 (21 11:19 -0700) | ||
| tree | f79f6b944636060af6bad10e05f5ab267359b34b | treesnapshot (tar.gz zip) |
| parent | 8881d35cace41604dba72c1b6b5ab5a59e0c2b94 | commitdiff |
ref-filter: make combining --merged & --no-merged an error
Change the behavior of specifying --merged & --no-merged to be an
error, instead of silently picking the option that was provided last.
Subsequent changes of mine add a --no-contains option in addition to
the existing --contains. Providing both of those isn't an error, and
has actual meaning.
Making its cousins have different behavior in this regard would be
confusing to the user, especially since we'd be silently disregarding
some of their command-line input.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Change the behavior of specifying --merged & --no-merged to be an
error, instead of silently picking the option that was provided last.
Subsequent changes of mine add a --no-contains option in addition to
the existing --contains. Providing both of those isn't an error, and
has actual meaning.
Making its cousins have different behavior in this regard would be
confusing to the user, especially since we'd be silently disregarding
some of their command-line input.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>