| commit | 3fe735e723102b631a5509dc5f2ce835616d92e7 | |
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | |
| Sun, 27 May 2018 08:38:27 +0000 (27 10:38 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 29 May 2018 04:28:47 +0000 (29 13:28 +0900) | ||
| tree | 6e30e6a023ee69130f0b1e81f67cbe2968c7d46e | treesnapshot (tar.gz zip) |
| parent | 2b1c01d22ef280ef3a6efd70db2b9aa58359ee36 | commitdiff |
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>
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>
| builtin/checkout.c | diffblobblamehistory | |
| t/t9902-completion.sh | diffblobblamehistory |