Merge branch 'nd/repo-clear-keep-the-index'

Junio C Hamano committed over 8 years ago

Merge branch 'ma/lockfile-cleanup'

Junio C Hamano committed over 8 years ago

Merge branch 'sg/t6500-no-redirect-of-stdin'

Junio C Hamano committed over 8 years ago

Merge branch 'bp/merge-rename-config'

Junio C Hamano committed over 8 years ago

Merge branch 'js/sequencer-and-root-commits'

Junio C Hamano committed over 8 years ago

Merge branch 'dd/send-email-reedit'

Junio C Hamano committed over 8 years ago

init: fix grammar in "templates not found" msg

Robert P. J. Day committed over 8 years ago

sequencer: ensure labels that are object IDs are rewritten

brian m. carlson committed over 8 years ago

t990X: use '.git/objects' as 'deep inside .git' path

Christian Couder committed over 8 years ago

Sync with Git 2.17.1

Junio C Hamano committed over 8 years ago

completion: complete general config vars in two steps

Nguyễn Thái Ngọc Duy committed over 8 years ago

log-tree: allow to customize 'grafted' color

Nguyễn Thái Ngọc Duy committed over 8 years ago

completion: support case-insensitive config vars

Nguyễn Thái Ngọc Duy committed over 8 years ago

completion: keep other config var completion in camelCase

Nguyễn Thái Ngọc Duy committed over 8 years ago

completion: drop the hard coded list of config vars

Nguyễn Thái Ngọc Duy committed over 8 years ago

am: move advice.amWorkDir parsing back to advice.c

Nguyễn Thái Ngọc Duy committed over 8 years ago

advice: keep config name in camelCase in advice_config[]

Nguyễn Thái Ngọc Duy committed over 8 years ago

fsck: produce camelCase config key names

Nguyễn Thái Ngọc Duy committed over 8 years ago

help: add --config to list all available config

Nguyễn Thái Ngọc Duy committed over 8 years ago

fsck: factor out msg_id_info[] lazy initialization code

Nguyễn Thái Ngọc Duy committed over 8 years ago