| commit | 88221d92cbc21f629b60eb046e5aabd6cdc67cca | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 17 Feb 2016 18:03:40 +0000 (17 10:03 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 17 Feb 2016 18:03:40 +0000 (17 10:03 -0800) | ||
| tree | 1b12cd7368058dfb8bca8a9b695e8914a2679d77 | treesnapshot (tar.gz zip) |
| parent | ab2c107eab77a7879574992752a3ac96421bef34 | commitdiff |
| parent | 618244e160cb0777bc8d41055f7de0192b10ea0f | commitdiff |
Merge branch 'nd/do-not-move-worktree-manually' into maint
"git worktree" had a broken code that attempted to auto-fix
possible inconsistency that results from end-users moving a
worktree to different places without telling Git (the original
repository needs to maintain backpointers to its worktrees, but
"mv" run by end-users who are not familiar with that fact will
obviously not adjust them), which actually made things worse
when triggered.
* nd/do-not-move-worktree-manually:
worktree: stop supporting moving worktrees manually
worktree.c: fix indentation
"git worktree" had a broken code that attempted to auto-fix
possible inconsistency that results from end-users moving a
worktree to different places without telling Git (the original
repository needs to maintain backpointers to its worktrees, but
"mv" run by end-users who are not familiar with that fact will
obviously not adjust them), which actually made things worse
when triggered.
* nd/do-not-move-worktree-manually:
worktree: stop supporting moving worktrees manually
worktree.c: fix indentation
| setup.c | diff1 | diff2 | blobhistory |