diff options
author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-05-27 10:38:27 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-05-29 13:28:47 +0900 |
commit | 3fe735e723102b631a5509dc5f2ce835616d92e7 (patch) | |
tree | 6e30e6a023ee69130f0b1e81f67cbe2968c7d46e /t/t4013/diff.log_--patch-with-stat_master_--_dir_ | |
parent | parse-options: option to let --git-completion-helper show negative form (diff) | |
download | tgif-3fe735e723102b631a5509dc5f2ce835616d92e7.tar.xz |
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/t4013/diff.log_--patch-with-stat_master_--_dir_')
0 files changed, 0 insertions, 0 deletions