]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6767149 a18c18b)
Merge branch 'en/random-cleanups'
authorJunio C Hamano <gitster@pobox.com>
Sat, 29 Mar 2025 07:39:10 +0000 (16:39 +0900)
committerJunio C Hamano <gitster@pobox.com>
Sat, 29 Mar 2025 07:39:10 +0000 (16:39 +0900)
commitff926a6d1b37a8c7c675bc8f8931474bdb525e8c
tree3c1c6f5b2836e5b006540bba530667877cc372a5tree
parent6767149eca352db846ae065fa67614a1b4bc45a6commit | diff
parenta18c18b470f108c70717ed22c0ab5b892c6d3683commit | diff
Merge branch 'en/random-cleanups'

Miscellaneous code clean-ups.

* en/random-cleanups:
  merge-ort: remove extraneous word in comment
  merge-ort: fix accidental strset<->strintmap
  t7615: be more explicit about diff algorithm used
  t6423: fix a comment that accidentally reversed two commits
  stash: remove merge-recursive.h include
merge-ort.c diff1 | diff2 | blob | history
t/t6423-merge-rename-directories.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.