summaryrefslogtreecommitdiff
path: root/builtin/rebase--interactive.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-11-13 22:37:26 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-11-13 22:37:26 +0900
commite146cc97be4c054c60d38e9f4edcdc33205bf563 (patch)
treeb36de8c572922ac1c0fda47c028cd7ccd8fd7a35 /builtin/rebase--interactive.c
parentMerge branch 'bp/refresh-index-using-preload' (diff)
parentgit-worktree.txt: correct linkgit command name (diff)
downloadtgif-e146cc97be4c054c60d38e9f4edcdc33205bf563.tar.xz
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
Diffstat (limited to 'builtin/rebase--interactive.c')
0 files changed, 0 insertions, 0 deletions