summaryrefslogtreecommitdiff
path: root/contrib/diff-highlight
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-01-10 15:24:27 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-01-10 15:24:28 -0800
commitda2b74eeec0b12d7b20d34a5e284295f81ad40a8 (patch)
tree3259c3bf07a1439bb3be7f57b352aa58d609c318 /contrib/diff-highlight
parentMerge branch 'jc/retire-compaction-heuristics' (diff)
parentworktree: initialize return value for submodule_uses_worktrees (diff)
downloadtgif-da2b74eeec0b12d7b20d34a5e284295f81ad40a8.tar.xz
Merge branch 'sb/submodule-embed-gitdir'
A new submodule helper "git submodule embedgitdirs" to make it easier to move embedded .git/ directory for submodules in a superproject to .git/modules/ (and point the latter with the former that is turned into a "gitdir:" file) has been added. * sb/submodule-embed-gitdir: worktree: initialize return value for submodule_uses_worktrees submodule: add absorb-git-dir function move connect_work_tree_and_git_dir to dir.h worktree: check if a submodule uses worktrees test-lib-functions.sh: teach test_commit -C <dir> submodule helper: support super prefix submodule: use absolute path for computing relative path connecting
Diffstat (limited to 'contrib/diff-highlight')
0 files changed, 0 insertions, 0 deletions