mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
b221b5ab9b92f3def37184db6e052ec87d7635b4
git/builtin
History
Nguyễn Thái Ngọc Duy 3fe735e723 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>
2018-05-29 13:28:47 +09:00
..
add.c
exec_cmd: rename to use dash in file name
2018-04-11 18:11:00 +09:00
am.c
exec_cmd: rename to use dash in file name
2018-04-11 18:11:00 +09:00
annotate.c
…
apply.c
…
archive.c
correct error messages for NULL packet_read_line()
2018-02-08 12:37:30 -08:00
bisect--helper.c
bisect: mention "view" as an alternative to "visualize"
2017-11-13 10:51:14 +09:00
blame.c
cache.h: add repository argument to oid_object_info
2018-04-26 10:54:27 +09:00
branch.c
Merge branch 'ot/libify-get-ref-atom-value'
2018-05-08 15:59:18 +09:00
bundle.c
…
cat-file.c
cache.h: add repository argument to oid_object_info
2018-04-26 10:54:27 +09:00
check-attr.c
…
check-ignore.c
check-ignore: fix mix of directories and other file types
2018-02-12 13:09:35 -08:00
check-mailmap.c
…
check-ref-format.c
Merge branch 'jc/check-ref-format-oor' into maint
2017-11-15 12:04:57 +09:00
checkout-index.c
parse-options: let OPT__FORCE take optional flags argument
2018-02-09 10:24:50 -08:00
checkout.c
completion: suppress some -no- options
2018-05-29 13:28:47 +09:00
clean.c
completion: use __gitcomp_builtin in _git_clean
2018-02-09 10:24:50 -08:00
clone.c
Merge branch 'bw/protocol-v2'
2018-05-08 15:59:16 +09:00
column.c
column: fix off-by-one default width
2018-05-13 10:45:05 +09:00
commit-graph.c
commit-graph: implement "--append" option
2018-04-11 10:43:02 +09:00
commit-tree.c
sha1_file: convert assert_sha1_type to object_id
2018-03-14 09:23:49 -07:00
commit.c
wt-status: use settings from git_diff_ui_config
2018-05-06 12:59:33 +09:00
config.c
builtin/config: introduce color type specifier
2018-04-23 22:52:20 +09:00
count-objects.c
packfile: keep prepare_packed_git() private
2018-03-26 10:07:43 -07:00
credential.c
…
describe.c
Merge branch 'sb/oid-object-info'
2018-05-23 14:38:16 +09:00
diff-files.c
…
diff-index.c
…
diff-tree.c
object: rename function 'typename' to 'type_name'
2018-02-14 13:10:05 -08:00
diff.c
treewide: replace maybe_tree with accessor methods
2018-04-11 10:47:16 +09:00
difftool.c
exec_cmd: rename to use dash in file name
2018-04-11 18:11:00 +09:00
fast-export.c
Merge branch 'sb/oid-object-info'
2018-05-23 14:38:16 +09:00
fetch-pack.c
Merge branch 'bw/protocol-v2'
2018-05-08 15:59:16 +09:00
fetch.c
Merge branch 'sb/oid-object-info'
2018-05-23 14:38:16 +09:00
fmt-merge-msg.c
sha1_file: convert read_sha1_file to struct object_id
2018-03-14 09:23:50 -07:00
for-each-ref.c
…
fsck.c
cache.h: add repository argument to oid_object_info
2018-04-26 10:54:27 +09:00
gc.c
Merge branch 'nd/repack-keep-pack'
2018-05-23 14:38:14 +09:00
get-tar-commit-id.c
…
grep.c
Merge branch 'sb/submodule-move-nested'
2018-05-08 15:59:17 +09:00
hash-object.c
exec_cmd: rename to use dash in file name
2018-04-11 18:11:00 +09:00
help.c
exec_cmd: rename to use dash in file name
2018-04-11 18:11:00 +09:00
index-pack.c
Merge branch 'sb/oid-object-info'
2018-05-23 14:38:16 +09:00
init-db.c
exec_cmd: rename to use dash in file name
2018-04-11 18:11:00 +09:00
interpret-trailers.c
…
log.c
Merge branch 'bc/format-patch-cover-no-attach'
2018-05-23 14:38:21 +09:00
ls-files.c
Convert find_unique_abbrev* to struct object_id
2018-03-14 09:23:48 -07:00
ls-remote.c
Merge branch 'bw/server-options'
2018-05-23 14:38:15 +09:00
ls-tree.c
cache.h: add repository argument to oid_object_info
2018-04-26 10:54:27 +09:00
mailinfo.c
…
mailsplit.c
…
merge-base.c
Merge branch 'ma/reduce-heads-leakfix'
2017-11-15 12:14:32 +09:00
merge-file.c
…
merge-index.c
…
merge-ours.c
Merge branch 'bw/diff-opt-impl-to-bitfields'
2017-11-09 14:31:27 +09:00
merge-recursive.c
…
merge-tree.c
exec_cmd: rename to use dash in file name
2018-04-11 18:11:00 +09:00
merge.c
Merge branch 'sb/object-store'
2018-04-11 13:09:55 +09:00
mktag.c
replace-object: add repository argument to lookup_replace_object
2018-04-12 11:38:56 +09:00
mktree.c
cache.h: add repository argument to oid_object_info
2018-04-26 10:54:27 +09:00
mv.c
Merge branch 'sb/submodule-move-nested'
2018-05-08 15:59:17 +09:00
name-rev.c
Convert find_unique_abbrev* to struct object_id
2018-03-14 09:23:48 -07:00
notes.c
exec_cmd: rename to use dash in file name
2018-04-11 18:11:00 +09:00
pack-objects.c
Merge branch 'nd/pack-unreachable-objects-doc'
2018-05-23 14:38:24 +09:00
pack-redundant.c
Merge branch 'sb/packfiles-in-repository'
2018-04-11 13:09:55 +09:00
pack-refs.c
refs: add repository argument to get_main_ref_store
2018-04-12 11:38:56 +09:00
patch-id.c
…
prune-packed.c
…
prune.c
cache.h: add repository argument to oid_object_info
2018-04-26 10:54:27 +09:00
pull.c
pull: accept --rebase=merges to recreate the branch topology
2018-04-26 12:28:43 +09:00
push.c
push: colorize errors
2018-04-24 10:38:47 +09:00
read-tree.c
…
rebase--helper.c
rebase -i: introduce --rebase-merges=[no-]rebase-cousins
2018-04-26 12:28:43 +09:00
receive-pack.c
Merge branch 'bw/protocol-v2'
2018-05-08 15:59:16 +09:00
reflog.c
Merge branch 'ds/lazy-load-trees'
2018-05-23 14:38:13 +09:00
remote-ext.c
…
remote-fd.c
…
remote.c
Merge branch 'js/rebase-recreate-merge'
2018-05-23 14:38:20 +09:00
repack.c
repack: add --keep-pack option
2018-04-16 13:52:29 +09:00
replace.c
Merge branch 'js/deprecate-grafts'
2018-05-23 14:38:17 +09:00
rerere.c
…
reset.c
Convert find_unique_abbrev* to struct object_id
2018-03-14 09:23:48 -07:00
rev-list.c
Merge branch 'bc/object-id'
2018-04-10 08:25:45 +09:00
rev-parse.c
Merge branch 'bw/c-plus-plus' into ds/lazy-load-trees
2018-04-11 10:46:32 +09:00
revert.c
sequencer: improve config handling
2017-12-13 11:15:14 -08:00
rm.c
Merge branch 'bc/object-id'
2018-04-10 08:25:45 +09:00
send-pack.c
protocol: introduce enum protocol_version value protocol_v2
2018-03-14 14:15:07 -07:00
serve.c
serve: introduce git-serve
2018-03-15 12:01:08 -07:00
shortlog.c
Merge branch 'ps/contains-id-error-message'
2018-04-10 16:28:20 +09:00
show-branch.c
Convert find_unique_abbrev* to struct object_id
2018-03-14 09:23:48 -07:00
show-ref.c
Convert find_unique_abbrev* to struct object_id
2018-03-14 09:23:48 -07:00
stripspace.c
…
submodule--helper.c
Merge branch 'nd/submodule-status-fix'
2018-05-08 15:59:31 +09:00
symbolic-ref.c
refs: rename constant REF_NODEREF to REF_NO_DEREF
2017-11-06 10:31:08 +09:00
tag.c
Merge branch 'sb/oid-object-info'
2018-05-23 14:38:16 +09:00
unpack-file.c
sha1_file: convert read_sha1_file to struct object_id
2018-03-14 09:23:50 -07:00
unpack-objects.c
cache.h: add repository argument to oid_object_info
2018-04-26 10:54:27 +09:00
update-index.c
Merge branch 'ps/contains-id-error-message'
2018-04-10 16:28:20 +09:00
update-ref.c
refs: rename constant REF_NODEREF to REF_NO_DEREF
2017-11-06 10:31:08 +09:00
update-server-info.c
parse-options: let OPT__FORCE take optional flags argument
2018-02-09 10:24:50 -08:00
upload-archive.c
…
upload-pack.c
Merge branch 'bw/protocol-v2'
2018-05-08 15:59:16 +09:00
var.c
…
verify-commit.c
sha1_file: convert read_sha1_file to struct object_id
2018-03-14 09:23:50 -07:00
verify-pack.c
…
verify-tag.c
ref-filter: use "struct object_id" consistently
2018-04-09 06:14:45 +09:00
worktree.c
Merge branch 'tg/worktree-add-existing-branch'
2018-05-23 14:38:18 +09:00
write-tree.c
cache-tree: convert write_*_as_tree to object_id
2018-03-14 09:23:47 -07:00