merge-recursive: enforce opt->ancestor != NULL when calling merge_trees()

Elijah Newren committed about 7 years ago

checkout: provide better conflict hunk description with detached HEAD

Elijah Newren committed about 7 years ago

merge-recursive: be consistent with assert

Elijah Newren committed about 7 years ago

Git 2.23

Junio C Hamano committed about 7 years ago

Merge tag 'l10n-2.23.0-rnd2' of git://github.com/git-l10n/git-po

Junio C Hamano committed about 7 years ago

checkout: remove duplicate code

Elijah Newren committed about 7 years ago

l10n: zh_CN: for git v2.23.0 l10n round 1~2

Jiang Xin committed about 7 years ago

http: use xmalloc with cURL

Carlo Marcelo Arenas Belón committed about 7 years ago

diff: 'diff.indentHeuristic' is no longer experimental

SZEDER Gábor committed about 7 years ago

repo-settings: create feature.experimental setting

Derrick Stolee committed about 7 years ago

repo-settings: create feature.manyFiles setting

Derrick Stolee committed about 7 years ago

repo-settings: parse core.untrackedCache

Derrick Stolee committed about 7 years ago

commit-graph: turn on commit-graph by default

Derrick Stolee committed about 7 years ago

t6501: use 'git gc' in quiet mode

Derrick Stolee committed about 7 years ago

repo-settings: consolidate some config settings

Derrick Stolee committed about 7 years ago

worktree remove: clarify error message on dirty worktree

SZEDER Gábor committed about 7 years ago

completion: complete config variables and values for 'git clone --config='

SZEDER Gábor committed about 7 years ago

completion: complete config variables names and values for 'git clone -c'

SZEDER Gábor committed about 7 years ago

completion: complete values of configuration variables after 'git -c var='

SZEDER Gábor committed about 7 years ago

completion: complete configuration sections and variable names for 'git -c'

SZEDER Gábor committed about 7 years ago