From: Junio C Hamano 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: https://git.lorimer.id.au/gitweb.git/diff_plain/d6c196abfd992a884a2e1ae1275b2abfac6f6d76?hp=--cc 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