summaryrefslogtreecommitdiffstats
path: root/Documentation/config.txt (follow)
Commit message (Collapse)AuthorAgeFilesLines
* doc: move extensions.worktreeConfig to the right placeNguyễn Thái Ngọc Duy2018-11-161-7/+0
| | | | | | | | | | | | | | | All config extensions are described in technical/repository-version.txt. I made a mistake of adding it in config.txt instead. This patch moves it back to where it belongs. Since repository-version.txt is not part of officially generated documents (it's not even part of DOC_HTML target), it's only visible to developers who read plain .txt files. Let's include it in gitrepository-layout.5 for more visibility. Some minor asciidoc fixes are required in repository-version.txt to make this happen. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Merge branch 'nd/per-worktree-config'Junio C Hamano2018-11-131-2/+10
|\ | | | | | | | | | | | | | | | | | | | | | | A fourth class of configuration files (in addition to the traditional "system wide", "per user in the $HOME directory" and "per repository in the $GIT_DIR/config") has been introduced so that different worktrees that share the same repository (hence the same $GIT_DIR/config file) can use different customization. * nd/per-worktree-config: worktree: add per-worktree config files t1300: extract and use test_cmp_config()
| * worktree: add per-worktree config filesNguyễn Thái Ngọc Duy2018-10-221-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A new repo extension is added, worktreeConfig. When it is present: - Repository config reading by default includes $GIT_DIR/config _and_ $GIT_DIR/config.worktree. "config" file remains shared in multiple worktree setup. - The special treatment for core.bare and core.worktree, to stay effective only in main worktree, is gone. These config settings are supposed to be in config.worktree. This extension is most useful in multiple worktree setup because you now have an option to store per-worktree config (which is either .git/config.worktree for main worktree, or .git/worktrees/xx/config.worktree for linked ones). This extension can be used in single worktree mode, even though it's pretty much useless (but this can happen after you remove all linked worktrees and move back to single worktree). "git config" reads from both "config" and "config.worktree" by default (i.e. without either --user, --file...) when this extension is present. Default writes still go to "config", not "config.worktree". A new option --worktree is added for that (*). Since a new repo extension is introduced, existing git binaries should refuse to access to the repo (both from main and linked worktrees). So they will not misread the config file (i.e. skip the config.worktree part). They may still accidentally write to the config file anyway if they use with "git config --file <path>". This design places a bet on the assumption that the majority of config variables are shared so it is the default mode. A safer move would be default writes go to per-worktree file, so that accidental changes are isolated. (*) "git config --worktree" points back to "config" file when this extension is not present and there is only one worktree so that it works in any both single and multiple worktree setups. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | config.txt: move worktree.* to a separate fileNguyễn Thái Ngọc Duy2018-10-291-9/+1
| | | | | | | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | config.txt: move web.* to a separate fileNguyễn Thái Ngọc Duy2018-10-291-4/+1
| | | | | | | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | config.txt: move versionsort.* to a separate fileNguyễn Thái Ngọc Duy2018-10-291-33/+1
| | | | | | | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | config.txt: move user.* to a separate fileNguyễn Thái Ngọc Duy2018-10-291-26/+1
| | | | | | | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | config.txt: move url.* to a separate fileNguyễn Thái Ngọc Duy2018-10-291-30/+1
| | | | | | | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | config.txt: move uploadpack.* to a separate fileNguyễn Thái Ngọc Duy2018-10-291-65/+1
| | | | | | | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | config.txt: move uploadarchive.* to a separate fileNguyễn Thái Ngọc Duy2018-10-291-6/+1
| | | | | | | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | config.txt: move transfer.* to a separate fileNguyễn Thái Ngọc Duy2018-10-291-71/+1
| | | | | | | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | config.txt: move tag.* to a separate fileNguyễn Thái Ngọc Duy2018-10-291-16/+1
| | | | | | | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | config.txt: move submodule.* to a separate fileNguyễn Thái Ngọc Duy2018-10-291-1/+1
| | | | | | | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | config.txt: move stash.* to a separate fileNguyễn Thái Ngọc Duy2018-10-291-9/+1
| | | | | | | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | config.txt: move status.* to a separate fileNguyễn Thái Ngọc Duy2018-10-291-72/+1
| | | | | | | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | config.txt: move splitIndex.* to a separate fileNguyễn Thái Ngọc Duy2018-10-291-24/+1
| | | | | | | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | config.txt: move showBranch.* to a separate fileNguyễn Thái Ngọc Duy2018-10-291-3/+1
| | | | | | | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | config.txt: move sequencer.* to a separate fileNguyễn Thái Ngọc Duy2018-10-291-5/+1
| | | | | | | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | config.txt: move sendemail-config.txt to config/Nguyễn Thái Ngọc Duy2018-10-291-1/+1
| | | | | | | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | config.txt: move reset.* to a separate fileNguyễn Thái Ngọc Duy2018-10-291-2/+1
| | | | | | | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | config.txt: move rerere.* to a separate fileNguyễn Thái Ngọc Duy2018-10-291-12/+1
| | | | | | | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | config.txt: move repack.* to a separate fileNguyễn Thái Ngọc Duy2018-10-291-27/+1
| | | | | | | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | config.txt: move remotes.* to a separate fileNguyễn Thái Ngọc Duy2018-10-291-3/+1
| | | | | | | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | config.txt: move remote.* to a separate fileNguyễn Thái Ngọc Duy2018-10-291-78/+1
| | | | | | | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | config.txt: move receive-config.txt to config/Nguyễn Thái Ngọc Duy2018-10-291-1/+1
| | | | | | | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | config.txt: move rebase-config.txt to config/Nguyễn Thái Ngọc Duy2018-10-291-1/+1
| | | | | | | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | config.txt: move push-config.txt to config/Nguyễn Thái Ngọc Duy2018-10-291-1/+1
| | | | | | | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | config.txt: move pull-config.txt to config/Nguyễn Thái Ngọc Duy2018-10-291-1/+1
| | | | | | | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | config.txt: move protocol.* to a separate fileNguyễn Thái Ngọc Duy2018-10-291-64/+1
| | | | | | | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | config.txt: move pretty.* to a separate fileNguyễn Thái Ngọc Duy2018-10-291-9/+1
| | | | | | | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | config.txt: move pager.* to a separate fileNguyễn Thái Ngọc Duy2018-10-291-8/+1
| | | | | | | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | config.txt: move pack.* to a separate fileNguyễn Thái Ngọc Duy2018-10-291-120/+1
| | | | | | | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | config.txt: move notes.* to a separate fileNguyễn Thái Ngọc Duy2018-10-291-59/+1
| | | | | | | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | config.txt: move mergetool.* to a separate fileNguyễn Thái Ngọc Duy2018-10-291-53/+1
| | | | | | | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | config.txt: move merge-config.txt to config/Nguyễn Thái Ngọc Duy2018-10-291-1/+1
| | | | | | | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | config.txt: move man.* to a separate fileNguyễn Thái Ngọc Duy2018-10-291-12/+1
| | | | | | | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | config.txt: move mailmap.* to a separate fileNguyễn Thái Ngọc Duy2018-10-291-15/+1
| | | | | | | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | config.txt: move mailinfo.* to a separate fileNguyễn Thái Ngọc Duy2018-10-291-6/+1
| | | | | | | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | config.txt: move log.* to a separate fileNguyễn Thái Ngọc Duy2018-10-291-43/+1
| | | | | | | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | config.txt: move interactive.* to a separate fileNguyễn Thái Ngọc Duy2018-10-291-16/+1
| | | | | | | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | config.txt: move instaweb.* to a separate fileNguyễn Thái Ngọc Duy2018-10-291-20/+1
| | | | | | | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | config.txt: move init.* to a separate fileNguyễn Thái Ngọc Duy2018-10-291-3/+1
| | | | | | | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | config.txt: move index.* to a separate fileNguyễn Thái Ngọc Duy2018-10-291-10/+1
| | | | | | | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | git-imap-send.txt: move imap.* to a separate fileNguyễn Thái Ngọc Duy2018-10-291-3/+1
| | | | | | | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | config.txt: move i18n.* to a separate fileNguyễn Thái Ngọc Duy2018-10-291-10/+1
| | | | | | | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | config.txt: move http.* to a separate fileNguyễn Thái Ngọc Duy2018-10-291-271/+1
| | | | | | | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | config.txt: move ssh.* to a separate fileNguyễn Thái Ngọc Duy2018-10-291-36/+2
| | | | | | | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | config.txt: move help.* to a separate fileNguyễn Thái Ngọc Duy2018-10-291-23/+1
| | | | | | | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | config.txt: move guitool.* to a separate fileNguyễn Thái Ngọc Duy2018-10-291-50/+1
| | | | | | | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | config.txt: move gui-config.txt to config/Nguyễn Thái Ngọc Duy2018-10-291-1/+1
| | | | | | | | | | Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-22 12:35:08 +0100