From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 29 Oct 2021 22:43:15 +0000 (-0700)
Subject: Merge branch 'ma/doc-folder-to-directory'
X-Git-Tag: v2.34.0-rc0~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fc0c491f65d20cc9da99400c7b86e9a17956041a;p=thirdparty%2Fgit.git

Merge branch 'ma/doc-folder-to-directory'

Consistently use 'directory', not 'folder', to call the filesystem
entity that collects a group of files and, eh, directories.

* ma/doc-folder-to-directory:
  gitweb.txt: change "folder" to "directory"
  gitignore.txt: change "folder" to "directory"
  git-multi-pack-index.txt: change "folder" to "directory"
---

fc0c491f65d20cc9da99400c7b86e9a17956041a