oidset: introduce 'oidset_size'

Taylor Blau committed over 6 years ago

builtin/commit-graph.c: introduce split strategy 'replace'

Taylor Blau committed over 6 years ago

builtin/commit-graph.c: introduce split strategy 'no-merge'

Taylor Blau committed over 6 years ago

builtin/commit-graph.c: support for '--split[=<strategy>]'

Taylor Blau committed over 6 years ago

t/helper/test-read-graph.c: support commit-graph chains

Taylor Blau committed over 6 years ago

Sync with v2.26.1

Junio C Hamano committed over 6 years ago

gitk: fix the context menu not appearing in the presence of submodule diffs

Роман Донченко committed over 6 years ago

gitk: Un-hide selection in areas with non-default background color

Johannes Sixt committed over 6 years ago

gitk: add diff lines background colors

Stefan Dotterweich committed over 6 years ago

gitk: be prepared to be run in a bare repository

Junio C Hamano committed over 6 years ago

t: restrict `is_hidden` to be called only on Windows

Johannes Schindelin committed over 6 years ago

mingw: make test_path_is_hidden more robust

Johannes Schindelin committed over 6 years ago

t: consolidate the `is_hidden` functions

Johannes Schindelin committed over 6 years ago

merge: use skip_prefix to parse config key

Martin Ågren committed over 6 years ago

rebase --merge: optionally skip upstreamed commits

Jonathan Tan committed over 6 years ago

rebase: fix an incompatible-options error message

Elijah Newren committed over 6 years ago

rebase: reinstate --no-keep-empty

Elijah Newren committed over 6 years ago

rebase -i: mark commits that begin empty in todo editor

Elijah Newren committed over 6 years ago

config: reject parsing of files over INT_MAX

Jeff King committed over 6 years ago

config: use size_t to store parsed variable baselen

Jeff King committed over 6 years ago