]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 72e4eb5 22d421f)
Merge branch 'ac/deglobal-fmt-merge-log-config'
authorJunio C Hamano <gitster@pobox.com>
Fri, 22 Aug 2025 20:13:21 +0000 (13:13 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 22 Aug 2025 20:13:21 +0000 (13:13 -0700)
commit9d6e319ec5190a0f5e19d8c7b7a73a4439042df6
tree9efe5534492c1b54bf6821f3a71afba2410b75edtree | snapshot
parent72e4eb56f0a89ed4345ee9f806321cc49b0e7a0dcommit | diff
parent22d421fed9cd5757a9da5a97e5b53ded54e93fe9commit | diff
Merge branch 'ac/deglobal-fmt-merge-log-config'

Code clean-up.

* ac/deglobal-fmt-merge-log-config:
  builtin/fmt-merge-msg: stop depending on 'the_repository'
  environment: remove the global variable 'merge_log_config'
builtin/merge.c diff1 | diff2 | blob | history
environment.c diff1 | diff2 | blob | history
fmt-merge-msg.c diff1 | diff2 | blob | history
t/t1517-outside-repo.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.