From: Jiang Xin <worldhello.net@gmail.com>
Date: Sat, 30 Oct 2021 01:34:30 +0000 (+0800)
Subject: Merge branch 'master' of github.com:git/git
X-Git-Tag: v2.34.0~1^2~36
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cd9ef9ce67bf2934845a6a76a1ecdbc9a5f7a6e0;p=thirdparty%2Fgit.git

Merge branch 'master' of github.com:git/git

* 'master' of github.com:git/git: (762 commits)
  Git 2.34-rc0
  wrapper: remove xunsetenv()
  log: document --encoding behavior on iconv() failure
  Revert "logmsg_reencode(): warn when iconv() fails"
  completion: fix incorrect bash/zsh string equality check
  add, rm, mv: fix bug that prevents the update of non-sparse dirs
  git-bundle.txt: add missing words and punctuation
  Documentation/Makefile: fix lint-docs mkdir dependency
  submodule: drop unused sm_name parameter from append_fetch_remotes()
  The fifteenth batch
  gitweb.txt: change "folder" to "directory"
  gitignore.txt: change "folder" to "directory"
  git-multi-pack-index.txt: change "folder" to "directory"
  git.txt: fix typo
  archive: describe compression level option
  config.txt: fix typo
  command-list.txt: remove 'sparse-index' from main help
  userdiff-cpp: back out the digit-separators in numbers
  submodule--helper: fix incorrect newlines in an error message
  branch (doc): -m/-c copies config and reflog
  ...
---

cd9ef9ce67bf2934845a6a76a1ecdbc9a5f7a6e0