[pull] master from git:master - #137

Merged

pull[bot] merged 36 commits into

turkdevops:masterfrom

Nov 27, 2025

Commits on Oct 17, 2025

Revert "gitk: Only restore window size from ~/.gitk, not position"
j6t
committed
8b5636a
gitk: persist position and size of the Tags and Heads window
j6t
committed
bf5a55a

Commits on Nov 6, 2025

gitk: fix a 'continue' statement outside a loop to 'return'
j6t
committed
77e7aab
gitk: show unescaped file names on 'rename' and 'copy' lines
j6t
committed
d445a78
gitk: add external diff file rename detection

ToBoMi
authored and
j6t
committed
bdb1cf8

Commits on Nov 17, 2025

xdiff: add 'minimal' to XDF_DIFF_ALGORITHM_MASK

wetneb
authored and
gitster
committed
881793c
blame: make diff algorithm configurable

wetneb
authored and
gitster
committed
ffffb98
wrapper: simplify xmkstemp()

rscharfe
authored and
gitster
committed
f18aa68
t6429: update comment to mention correct tool

newren
authored and
gitster
committed
ffe702b
merge-ort: remove debugging crud

newren
authored and
gitster
committed
d5663a4
merge-ort: fix failing merges in special corner case

newren
authored and
gitster
committed
a562d90
wincred: avoid memory corruption

elieux
authored and
gitster
committed
d22a488
cmake: stop trying to build the reftable and xdiff libraries

dscho
authored and
gitster
committed
b0d5c88
mingw: avoid the comma operator

dscho
authored and
gitster
committed
af39198

Commits on Nov 18, 2025

ci: bump actions/setup-go from 5 to 6

dscho
authored and
gitster
committed
cd99203
unit-test: ignore --no-chain-lint

peff
authored and
gitster
committed
e96105a
ci(windows-meson-test): handle options and output like other test jobs

peff
authored and
gitster
committed
17bd110
test-mktemp: plug memory and descriptor leaks

peff
authored and
gitster
committed
14b561e
worktree list: fix column spacing

phillipwood
authored and
gitster
committed
a6238ee
worktree list: quote paths

phillipwood
authored and
gitster
committed
08dfa59

Commits on Nov 20, 2025

win32: return error if SleepConditionVariableCS fails

AZero13
authored and
gitster
committed
2367c6b

Commits on Nov 26, 2025

Merge branch 'js/persist-ref-window-geometry'
j6t
committed
bd3fd7e
Merge branch 'tb/external-diff-renamed'
j6t
committed
776223c
Merge branch 'master' of https://github.com/j6t/gitk
gitster
committed
42bf8a5
Merge branch 'en/ort-rename-another-fix'
gitster
committed
716e871
Merge branch 'ad/blame-diff-algorithm'
gitster
committed
1b93acd
Merge branch 'rs/xmkstemp-simplify'
gitster
committed
370470e
Merge branch 'jk/test-mktemp-leakfix'
gitster
committed
24ddb3f
Merge branch 'js/ci-github-setup-go-update'
gitster
committed
fa40522
Merge branch 'js/mingw-assign-comma-fix'
gitster
committed
eb474aa
Merge branch 'js/cmake-libgit-fix'
gitster
committed
35eaf96
Merge branch 'js/wincred-get-credential-alloc-fix'
gitster
committed
e539545
Merge branch 'pw/worktree-list-display-width-fix'
gitster
committed
d65eab5
Merge branch 'jk/ci-windows-meson-test-fix'
gitster
committed
536d284
Merge branch 'gf/win32-pthread-cond-wait-err'
gitster
committed
54af646
The fourth batch
gitster
committed
b31ab93