diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-05-27 08:38:27 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-29 04:28:47 (GMT) |
| commit | 3fe735e723102b631a5509dc5f2ce835616d92e7 (patch) | |
| tree | 6e30e6a023ee69130f0b1e81f67cbe2968c7d46e /t/t9902-completion.sh | |
| parent | 2b1c01d22ef280ef3a6efd70db2b9aa58359ee36 (diff) | |
| download | git-3fe735e723102b631a5509dc5f2ce835616d92e7.zip git-3fe735e723102b631a5509dc5f2ce835616d92e7.tar.gz git-3fe735e723102b631a5509dc5f2ce835616d92e7.tar.bz2 | |
completion: suppress some -no- options
Most --no- options do have some use, even if rarely to negate some
option that's specified in an alias.
These options --no-ours and --no-theirs however have no clear
semantics. If I specify "--ours --no-theirs", the second will reset
writeout stage and is equivalent of "--no-ours --no-theirs" which is
not that easy to see. Drop them. You can either switch from --ours to
--theirs and back but you can never negate them.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t9902-completion.sh')
| -rwxr-xr-x | t/t9902-completion.sh | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh index 07c3e3b..7e5e3ad 100755 --- a/t/t9902-completion.sh +++ b/t/t9902-completion.sh @@ -1245,9 +1245,7 @@ test_expect_success 'double dash "git checkout"' ' --orphan=Z --no-orphan Z --ours Z - --no-ours Z --theirs Z - --no-theirs Z --merge Z --no-merge Z --conflict=Z |