diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-02-17 10:03:40 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-02-17 10:03:40 -0800 |
| commit | 88221d92cbc21f629b60eb046e5aabd6cdc67cca (patch) | |
| tree | 1b12cd7368058dfb8bca8a9b695e8914a2679d77 /Documentation/gitdiffcore.txt | |
| parent | Merge branch 'js/xmerge-marker-eol' into maint (diff) | |
| parent | worktree: stop supporting moving worktrees manually (diff) | |
| download | tgif-88221d92cbc21f629b60eb046e5aabd6cdc67cca.tar.xz | |
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
Diffstat (limited to 'Documentation/gitdiffcore.txt')
0 files changed, 0 insertions, 0 deletions