[pull] master from git:master#107

Merged

pull[bot] merged 57 commits intoturkdevops:masterfrom

Sep 29, 2025

Commits on Sep 10, 2025

breaking-changes: switch default branch to main

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

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

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

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

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

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

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

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

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

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

jvns
authored and
gitster
committed

Commits on Sep 11, 2025

t/unit-tests: update clar to fcbed04

pks-t
authored and
gitster
committed

Commits on Sep 16, 2025

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

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

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

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

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

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

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

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

peff
authored and
gitster
committed

Commits on Sep 17, 2025

color: use git_colorbool enum type to store colorbools

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

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

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

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

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

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

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

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

KarthikNayak
authored and
gitster
committed

Commits on Sep 18, 2025

Commits on Sep 22, 2025

t3903: reduce dependencies on previous tests

benknoble
authored and
gitster
committed
t3905: remove unneeded blank line

benknoble
authored and
gitster
committed
stash: refactor private config globals

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

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

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

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

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

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

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

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

peff
authored and
gitster
committed

Commits on Sep 29, 2025