diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-10-03 13:30:34 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-10-03 13:30:35 -0700 |
| commit | 53eb85e6230e2c09dbc06f88b67e7a3baccc4446 (patch) | |
| tree | 6290667f96d15d82b964e5f9ed9db906e8fca616 /Documentation/git-mergetool.txt | |
| parent | Merge branch 'ik/gitweb-force-highlight' (diff) | |
| parent | init: kill git_link variable (diff) | |
| download | tgif-53eb85e6230e2c09dbc06f88b67e7a3baccc4446.tar.xz | |
Merge branch 'nd/init-core-worktree-in-multi-worktree-world'
"git init" tried to record core.worktree in the repository's
'config' file when GIT_WORK_TREE environment variable was set and
it was different from where GIT_DIR appears as ".git" at its top,
but the logic was faulty when .git is a "gitdir:" file that points
at the real place, causing trouble in working trees that are
managed by "git worktree". This has been corrected.
* nd/init-core-worktree-in-multi-worktree-world:
init: kill git_link variable
init: do not set unnecessary core.worktree
init: kill set_git_dir_init()
init: call set_git_dir_init() from within init_db()
init: correct re-initialization from a linked worktree
Diffstat (limited to 'Documentation/git-mergetool.txt')
0 files changed, 0 insertions, 0 deletions