diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-09-03 19:17:53 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-09-03 19:17:53 -0700 |
| commit | d6c196abfd992a884a2e1ae1275b2abfac6f6d76 (patch) | |
| tree | 19b50a61f2bd10c8f4a0c666a15a49ef664d424b /git-gui/lib/win32.tcl | |
| parent | e654e3b574bf1e4cc7556c2f01188eaf41271901 (diff) | |
| parent | 82fde87ff3be8d10854df18964e5816417a1d7cf (diff) | |
| download | git-d6c196abfd992a884a2e1ae1275b2abfac6f6d76.tar.gz git-d6c196abfd992a884a2e1ae1275b2abfac6f6d76.tar.xz | |
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
Diffstat (limited to 'git-gui/lib/win32.tcl')
0 files changed, 0 insertions, 0 deletions