summaryrefslogtreecommitdiff
path: root/Documentation/git-mergetool.txt
diff options
context:
space:
mode:
authorLibravatar Nguyễn Thái Ngọc Duy <pclouds@gmail.com>2017-08-23 19:36:52 +0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-08-24 14:44:41 -0700
commitbe489d02d2f95b34e8f0fd15b9ec4752a11edd4c (patch)
tree8453a4f7809bfcc5fd6fe96f753b30bb07a88fa1 /Documentation/git-mergetool.txt
parentrevision.c: refactor add_index_objects_to_pending() (diff)
downloadtgif-be489d02d2f95b34e8f0fd15b9ec4752a11edd4c.tar.xz
revision.c: --indexed-objects add objects from all worktrees
This is the result of single_worktree flag never being set (no way to up until now). To get objects from current index only, set single_worktree. The other add_index_objects_to_pending's caller is mark_reachable_objects() (e.g. "git prune") which also mark objects from all indexes. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-mergetool.txt')
0 files changed, 0 insertions, 0 deletions