git.99rst.org / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6356003 fada767)
Merge branch 'jk/die-on-bogus-worktree-late' into maint
authorJunio C Hamano <redacted>
Thu, 25 Jun 2015 18:02:13 +0000 (11:02 -0700)
committerJunio C Hamano <redacted>
Thu, 25 Jun 2015 18:02:13 +0000 (11:02 -0700)
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


Trivial merge
git clone https://git.99rst.org/PROJECT