[pull] master from git:master - #107

Merged

pull[bot] merged 57 commits into

turkdevops:masterfrom

Sep 29, 2025

Commits on Sep 10, 2025

breaking-changes: switch default branch to main

phillipwood
authored and
gitster
committed
67d9b39
t4013: switch default branch name to main

phillipwood
authored and
gitster
committed
877176e
t9902: switch default branch name to main

phillipwood
authored and
gitster
committed
3d6e7ec
t0613: stop setting default initial branch

phillipwood
authored and
gitster
committed
5590b4e
doc: git-checkout: clarify intro sentence

jvns
authored and
gitster
committed
21a5f94
doc: git-checkout: clarify ARGUMENT DISAMBIGUATION

jvns
authored and
gitster
committed
ea03d5a
doc: git-checkout: clarify `git checkout <branch>`

jvns
authored and
gitster
committed
ab215e4
doc: git-checkout: clarify `-b` and `-B`

jvns
authored and
gitster
committed
042d6f3
doc: git-checkout: deduplicate --detach explanation

jvns
authored and
gitster
committed
0dd71f6
doc: git-checkout: split up restoring files section

jvns
authored and
gitster
committed
bfe7b17
doc: git-checkout: clarify restoring files section

jvns
authored and
gitster
committed
83a9405

Commits on Sep 11, 2025

t/unit-tests: update clar to fcbed04

pks-t
authored and
gitster
committed
e7f04f6

Commits on Sep 16, 2025

Merge branch 'jk/add-i-color' into jk/color-variable-fixes
gitster
committed
e335ff3
color: use GIT_COLOR_* instead of numeric constants

peff
authored and
gitster
committed
3c3e9b8
color: return enum from git_config_colorbool()

peff
authored and
gitster
committed
53e8a43
grep: don't treat grep_opt.color as a strict bool

peff
authored and
gitster
committed
8ee2476
diff: simplify color_moved check when flushing

peff
authored and
gitster
committed
8efe643
diff: don't use diff_options.use_color as a strict bool

peff
authored and
gitster
committed
4cfc971
diff: pass o->use_color directly to fill_metainfo()

peff
authored and
gitster
committed
12df3c2
diff: stop passing ecbdata->use_color as boolean

peff
authored and
gitster
committed
955000d
pretty: use format_commit_context.auto_color as colorbool

peff
authored and
gitster
committed
5e9ddd3

Commits on Sep 17, 2025

color: use git_colorbool enum type to store colorbools

peff
authored and
gitster
committed
e9330ae
color: return bool from want_color()

peff
authored and
gitster
committed
b978f78
add-interactive: retain colorbool values longer

peff
authored and
gitster
committed
9d241b0
config: store want_color() result in a separate bool

peff
authored and
gitster
committed
69a7e8d
send-email: don't duplicate Reply-to: in intro message

neilbrown
authored and
gitster
committed
f448f65
refs/files: catch conflicts on case-insensitive file-systems

KarthikNayak
authored and
gitster
committed
3c07063
refs/files: use correct error type when lock exists

KarthikNayak
authored and
gitster
committed
9b62a67
refs/files: handle F/D conflicts in case-insensitive FS

KarthikNayak
authored and
gitster
committed
770f389
refs/files: handle D/F conflicts during locking

KarthikNayak
authored and
gitster
committed
948b2ab

Commits on Sep 18, 2025

last-modified: fix bug when some paths remain unhandled

To1ne
authored and
gitster
committed
e6c06e8
rebase -i: respect commit.cleanup when picking fixups

phillipwood
authored and
gitster
committed
5b44c3b
sequencer: remove VERBATIM_MSG flag

phillipwood
authored and
gitster
committed
82a0a73
initial branch: give hints after switching the default name
gitster
committed
373ad89

Commits on Sep 22, 2025

t3903: reduce dependencies on previous tests

benknoble
authored and
gitster
committed
80bc042
t3905: remove unneeded blank line

benknoble
authored and
gitster
committed
4b2de83
stash: refactor private config globals

benknoble
authored and
gitster
committed
88b5b8d
stash: honor stash.index in apply, pop modes

benknoble
authored and
gitster
committed
9842c0c
t/unit-tests: update to 10e96bc

pks-t
authored and
gitster
committed
93dbb6b
stash: tell setup_revisions() to free our allocated strings

peff
authored and
gitster
committed
3ea35c6
revision: manage memory ownership of argv in setup_revisions()

peff
authored and
gitster
committed
cd43948
revision: add wrapper to setup_revisions() from a strvec

peff
authored and
gitster
committed
f93c1d8
treewide: use setup_revisions_from_strvec() when we have a strvec

peff
authored and
gitster
committed
b553332
treewide: pass strvecs around for setup_revisions_from_strvec()

peff
authored and
gitster
committed
1806813
revision: retain argv NULL invariant in setup_revisions()

peff
authored and
gitster
committed
a04bc71

Commits on Sep 29, 2025

Merge branch 'ps/clar-updates'
gitster
committed
347af01
Merge branch 'nb/send-email-no-dup-reply-to'
gitster
committed
d235f69
Merge branch 'pw/3.0-default-initial-branch-to-main'
gitster
committed
e50c3ca
Merge branch 'jc/3.0-default-initial-branch-to-main-addendum'
gitster
committed
d960d6a
Merge branch 'pw/rebase-i-cleanup-fix'
gitster
committed
84edf99
Merge branch 'jk/setup-revisions-freefix'
gitster
committed
4bac57b
Merge branch 'je/doc-checkout'
gitster
committed
cff1e3c
Merge branch 'dk/stash-apply-index'
gitster
committed
a5d4779
Merge branch 'jk/color-variable-fixes'
gitster
committed
a89fa2f
Merge branch 'kn/refs-files-case-insensitive'
gitster
committed
96ed0a8
Merge branch 'tc/last-modified-recursive-fix'
gitster
committed
d5518d5
The thirteenth batcn
gitster
committed
821f583