| commit | e146cc97be4c054c60d38e9f4edcdc33205bf563 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 13 Nov 2018 13:37:26 +0000 (13 22:37 +0900) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 13 Nov 2018 13:37:26 +0000 (13 22:37 +0900) | ||
| tree | b36de8c572922ac1c0fda47c028cd7ccd8fd7a35 | treesnapshot (tar.gz zip) |
| parent | 11aa560de964e800aabce446d600ab0fb4c90c20 | commitdiff |
| parent | 14f74d59072c7bf0586b15165538373bed898f18 | commitdiff |
Merge branch 'nd/per-worktree-ref-iteration'
The code to traverse objects for reachability, used to decide what
objects are unreferenced and expendable, have been taught to also
consider per-worktree refs of other worktrees as starting points to
prevent data loss.
* nd/per-worktree-ref-iteration:
git-worktree.txt: correct linkgit command name
reflog expire: cover reflog from all worktrees
fsck: check HEAD and reflog from other worktrees
fsck: move fsck_head_link() to get_default_heads() to avoid some globals
revision.c: better error reporting on ref from different worktrees
revision.c: correct a parameter name
refs: new ref types to make per-worktree refs visible to all worktrees
Add a place for (not) sharing stuff between worktrees
refs.c: indent with tabs, not spaces
The code to traverse objects for reachability, used to decide what
objects are unreferenced and expendable, have been taught to also
consider per-worktree refs of other worktrees as starting points to
prevent data loss.
* nd/per-worktree-ref-iteration:
git-worktree.txt: correct linkgit command name
reflog expire: cover reflog from all worktrees
fsck: check HEAD and reflog from other worktrees
fsck: move fsck_head_link() to get_default_heads() to avoid some globals
revision.c: better error reporting on ref from different worktrees
revision.c: correct a parameter name
refs: new ref types to make per-worktree refs visible to all worktrees
Add a place for (not) sharing stuff between worktrees
refs.c: indent with tabs, not spaces