diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-06-25 11:02:13 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-06-25 11:02:13 -0700 |
| commit | f2bd231414fc9c22307971bcc6c5a3a96dec75c1 (patch) | |
| tree | c6e0d5dfb2d6c9aac571b294d604b0e332e44ef0 /cache.h | |
| parent | Merge branch 'pt/pull-tags-error-diag' into maint (diff) | |
| parent | setup_git_directory: delay core.bare/core.worktree errors (diff) | |
| download | tgif-f2bd231414fc9c22307971bcc6c5a3a96dec75c1.tar.xz | |
Merge branch 'jk/die-on-bogus-worktree-late' into maint
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 'cache.h')
0 files changed, 0 insertions, 0 deletions