git/Documentation/config, branch maint

Merge branch 'mh/doc-core-attributesfile'

2025-12-30T03:58:19Z

Doc update. * mh/doc-core-attributesfile: docs: note the type of core.attributesfile

docs: note the type of core.attributesfile

2025-12-18T00:15:17Z

The previous wording: > Path expansions are made the same way as for `core.excludesFile`. required one to check the docs for 'core.excludesFile' and from there the definition of the pathname variable type to understand the path expansion behaviour of this variable. Instead, just link directly to the pathname type. This change is basically the same rewording as was done to 'core.excludesFile' in dca83abd (config: describe 'pathname' value type, 2016-04-29). Signed-off-by: Matthew Hughes Signed-off-by: Junio C Hamano

Merge branch 'mh/doc-config-gui-gcwarning'

2025-12-17T05:11:53Z

Docfix. * mh/doc-config-gui-gcwarning: config: document 'gui.GCWarning'

config: document 'gui.GCWarning'

2025-12-08T22:38:56Z

While investigating the config options set by 'scalar' I noticed this one wasn't documented. Signed-off-by: Matthew Hughes Signed-off-by: Junio C Hamano

Merge branch 'jc/whitespace-incomplete-line'

2025-12-01T02:31:40Z

Both "git apply" and "git diff" learn a new whitespace error class, "incomplete-line". * jc/whitespace-incomplete-line: attr: enable incomplete-line whitespace error for this project diff: highlight and error out on incomplete lines apply: check and fix incomplete lines whitespace: allocate a few more bits and define WS_INCOMPLETE_LINE apply: revamp the parsing of incomplete lines diff: update the way rewrite diff handles incomplete lines diff: call emit_callback ecbdata everywhere diff: refactor output of incomplete line diff: keep track of the type of the last line seen diff: correct suppress_blank_empty hack diff: emit_line_ws_markup() if/else style fix whitespace: correct bit assignment comments

Merge branch 'ja/doc-synopsis-style'

2025-12-01T02:31:39Z

Doc mark-up updates. * ja/doc-synopsis-style: doc: pull-fetch-param typofix doc: convert git push to synopsis style doc: convert git pull to synopsis style doc: convert git fetch to synopsis style

Merge branch 'sa/replay-atomic-ref-updates'

2025-11-24T23:46:40Z

"git replay" (experimental) learned to perform ref updates itself in a transaction by default, instead of emitting where each refs should point at and leaving the actual update to another command. * sa/replay-atomic-ref-updates: replay: add replay.refAction config option replay: make atomic ref updates the default behavior replay: use die_for_incompatible_opt2() for option validation

doc: convert git push to synopsis style

2025-11-19T23:00:45Z

- Switch the synopsis to a synopsis block which will automatically format placeholders in italics and keywords in monospace - Use __ instead of in the description - Use `backticks` for keywords and more complex option descriptions. The new rendering engine will apply synopsis rules to these spans. Signed-off-by: Jean-Noël Avila Signed-off-by: Junio C Hamano

doc: convert git fetch to synopsis style

2025-11-19T23:00:37Z

whitespace: allocate a few more bits and define WS_INCOMPLETE_LINE

2025-11-12T22:04:04Z

Reserve a few more bits in the diff flags word to be used for future whitespace rules. Add WS_INCOMPLETE_LINE without implementing the behaviour (yet). Signed-off-by: Junio C Hamano