diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-11-13 22:37:18 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-13 22:37:18 +0900 |
| commit | 8c758f9a67a265ae51beddfd9895d48a42c2af13 (patch) | |
| tree | 555c2d42a1ef3f8d69c64a77fbdb0690d529ff3b /builtin/commit.c | |
| parent | Merge branch 'jk/stream-pack-non-delta-clarification' (diff) | |
| parent | worktree: add per-worktree config files (diff) | |
| download | git-8c758f9a67a265ae51beddfd9895d48a42c2af13.tar.gz git-8c758f9a67a265ae51beddfd9895d48a42c2af13.zip | |
Merge branch 'nd/per-worktree-config'
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()
Diffstat (limited to 'builtin/commit.c')
0 files changed, 0 insertions, 0 deletions