From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 4 Sep 2015 02:17:53 +0000 (-0700)
Subject: Merge branch 'nd/fixup-linked-gitdir' into maint
X-Git-Tag: v2.5.2~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d6c196abfd992a884a2e1ae1275b2abfac6f6d76;p=thirdparty%2Fgit.git

Merge branch 'nd/fixup-linked-gitdir' into maint

The code in "multiple-worktree" support that attempted to recover
from an inconsistent state updated an incorrect file.

* nd/fixup-linked-gitdir:
  setup: update the right file in multiple checkouts
---

d6c196abfd992a884a2e1ae1275b2abfac6f6d76