| commit | 91d54694a4e1da804063ce64b9757d5d3148e6ad | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 1 Sep 2015 23:31:06 +0000 (1 16:31 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 1 Sep 2015 23:31:07 +0000 (1 16:31 -0700) | ||
| tree | 76e7ad71adb050aff775e1049455493c9b1952ae | treesnapshot (tar.gz zip) |
| parent | 16163602bacb2804d00d599049a62b7af0b0b7b6 | commitdiff |
| parent | 82fde87ff3be8d10854df18964e5816417a1d7cf | commitdiff |
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
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 | blobhistory |