diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-06-17 00:27:06 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-06-17 00:27:06 +0300 |
| commit | 103b6f9c2b2bbafdbde694f9390fb203f70977f0 (patch) | |
| tree | dbdc12e487fe6474ae9bf661e2a20020ea4cf81e /merge.c | |
| parent | c7ca4424ea5644c6aa2c660a4a0726a75f8f2b84 (diff) | |
| parent | fada767463b599951b37bd544379a1d18dcf9370 (diff) | |
Merge branch 'jk/die-on-bogus-worktree-late'
The setup code used to die when core.bare and core.worktree are set
inconsistently, even for commands that do not need working tree.
* jk/die-on-bogus-worktree-late:
setup_git_directory: delay core.bare/core.worktree errors
Diffstat (limited to 'merge.c')
0 files changed, 0 insertions, 0 deletions