diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-05-13 14:05:49 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-05-13 14:05:49 -0700 |
| commit | a60abe10f2d54c668966f804bb400d21d08008a3 (patch) | |
| tree | e01f077183fc9b6d85a443404ec1618cae55206d /builtin/merge-base.c | |
| parent | Sync with 2.3.8 (diff) | |
| parent | init: don't set core.worktree when initializing /.git (diff) | |
| download | tgif-a60abe10f2d54c668966f804bb400d21d08008a3.tar.xz | |
Merge branch 'jk/init-core-worktree-at-root' into maint
We avoid setting core.worktree when the repository location is the
".git" directory directly at the top level of the working tree, but
the code misdetected the case in which the working tree is at the
root level of the filesystem (which arguably is a silly thing to
do, but still valid).
* jk/init-core-worktree-at-root:
init: don't set core.worktree when initializing /.git
Diffstat (limited to 'builtin/merge-base.c')
0 files changed, 0 insertions, 0 deletions