My Various Git Projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: cdc71c1) | patch
completion: use __gitcomp_builtin in _git_merge
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>
Fri, 9 Feb 2018 11:02:04 +0000 (18:02 +0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 9 Feb 2018 18:24:52 +0000 (10:24 -0800)
commit640c325b79a1ff6f23b7921c7de1023398962841
tree03be150be77423276f6a8d05ac3ecb476ac72092tree | snapshot
parentcdc71c1c5dabc2da7fd8c5c64dc4a3802720fe74commit | diff
completion: use __gitcomp_builtin in _git_merge

New completable options are:

--allow-unrelated-histories
--message=
--overwrite-ignore
--signoff
--strategy-option=
--summary
--verify

The variable $__git_merge_options remains because _git_pull() still
needs it. It will soon be gone after _git_pull() is updated.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
contrib/completion/git-completion.bash diff | blob | history
The core git plumbing