Git fork

The tenth batch

Signed-off-by: Junio C Hamano <gitster@pobox.com>

+20
+20
Documentation/RelNotes/2.41.0.txt
··· 50 50 choice of the hash algorithm from the source repository to the 51 51 newly created repository. 52 52 53 + * "git mergetool" and "git difftool" learns a new configuration 54 + guiDefault to optionally favor configured guitool over non-gui-tool 55 + automatically when $DISPLAY is set. 56 + 57 + * "git branch -d origin/master" would say "no such branch", but it is 58 + likely a missed "-r" if refs/remotes/origin/master exists. The 59 + command has been taught to give such a hint in its error message. 60 + 61 + * Clean-up of the code path that deals with merge strategy option 62 + handling in "git rebase". 63 + 53 64 54 65 Performance, Internal Implementation, Development Support etc. 55 66 ··· 87 98 88 99 * "git sparse-checkout" command learns a debugging aid for the sparse 89 100 rule definitions. 101 + 102 + * "git write-tree" learns to work better with sparse-index. 103 + 90 104 91 105 92 106 Fixes since v2.40 ··· 192 206 * Tests had a few places where we ignored PERL_PATH and blindly used 193 207 /usr/bin/perl, which have been corrected. 194 208 (merge c1917156a0 jk/use-perl-path-consistently later to maint). 209 + 210 + * Documentation mark-up fix. 211 + (merge 78b6369e67 la/mfc-markup-fix later to maint). 212 + 213 + * Doc toolchain update to remove old workaround for AsciiDoc. 214 + (merge 8806120de6 fc/remove-header-workarounds-for-asciidoc later to maint). 195 215 196 216 * Other code cleanup, docfix, build fix, etc. 197 217 (merge f7111175df as/doc-markup-fix later to maint).