git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1616360 82fde87)
Merge branch 'nd/fixup-linked-gitdir'
authorJunio C Hamano <redacted>
Tue, 1 Sep 2015 23:31:06 +0000 (16:31 -0700)
committerJunio C Hamano <redacted>
Tue, 1 Sep 2015 23:31:07 +0000 (16:31 -0700)
commit91d54694a4e1da804063ce64b9757d5d3148e6ad
tree76e7ad71adb050aff775e1049455493c9b1952aetree | snapshot
parent16163602bacb2804d00d599049a62b7af0b0b7b6commit | diff
parent82fde87ff3be8d10854df18964e5816417a1d7cfcommit | diff
Merge branch 'nd/fixup-linked-gitdir'

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
setup.c diff1 | diff2 | blob | history
git clone https://git.99rst.org/PROJECT