diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-04-10 08:25:45 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-04-10 08:25:45 +0900 |
| commit | ca923f72653f5bfc61933ee334ca5fe34d4fe5f0 (patch) | |
| tree | 2e0439f6b79469bc996b273270891e0cc0b332e6 /git-merge-one-file.sh | |
| parent | Merge branch 'bc/object-id' (diff) | |
| parent | worktree prune: improve prune logic when worktree is moved (diff) | |
| download | tgif-ca923f72653f5bfc61933ee334ca5fe34d4fe5f0.tar.xz | |
Merge branch 'nd/worktree-prune'
The way "git worktree prune" worked internally has been simplified,
by assuming how "git worktree move" moves an existing worktree to a
different place.
* nd/worktree-prune:
worktree prune: improve prune logic when worktree is moved
worktree: delete dead code
gc.txt: more details about what gc does
Diffstat (limited to 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions