merge-file: honor merge.conflictStyle outside of a repository

Yannik Tausch committed 6 months ago

ci: ubuntu: use GNU coreutils for dirname

Colin Stagner committed 6 months ago

merge-ours: integrate with sparse-index

Sam Bostock committed 6 months ago

merge-ours: drop USE_THE_REPOSITORY_VARIABLE

Sam Bostock committed 6 months ago

Documentation: update add --force option + ignore=all config

Claus Schneider(Eficode) committed 6 months ago

tests: fix existing tests when add an ignore=all submodule

Claus Schneider(Eficode) committed 6 months ago

tests: t2206-add-submodule-ignored: ignore=all and add --force tests

Claus Schneider(Eficode) committed 6 months ago

read-cache: submodule add need --force given ignore=all configuration

Claus Schneider(Eficode) committed 6 months ago

read-cache: update add_files_to_cache take param ignored_too

Claus Schneider(Eficode) committed 6 months ago

doc: fix repo_config documentation reference

SoutrikDas committed 6 months ago

doc: convert git-show to synopsis style

Jean-Noël Avila committed 6 months ago

doc: fix some style issues in git-clone and for-each-ref-options

Jean-Noël Avila committed 6 months ago

doc: finalize git-clone documentation conversion to synopsis style

Jean-Noël Avila committed 6 months ago

doc: convert git-submodule to synopsis style

Jean-Noël Avila committed 6 months ago

whitespace: symbolic links usually lack LF at the end

Junio C Hamano committed 6 months ago

gpg-interface: remove an unnecessary NULL initialization

Collin Funk committed 6 months ago

global: constify some pointers that are not written to

Collin Funk committed 6 months ago

Start 2.54 cycle

Junio C Hamano committed 6 months ago

Merge branch 'sp/t5500-cleanup'

Junio C Hamano committed 6 months ago

Merge branch 'tc/last-modified-options-cleanup'

Junio C Hamano committed 6 months ago