summaryrefslogtreecommitdiff
path: root/t/t7606-merge-custom.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-07-06 13:38:11 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-07-06 13:38:11 -0700
commit7a738b40f67fc44c2a2c1abcffe474241af3d30e (patch)
tree38045c933a3d7247599a9d2f5ba0d981ea7a8832 /t/t7606-merge-custom.sh
parentMerge branch 'jk/bisect-show-tree' (diff)
parentworktree: simplify prefixing paths (diff)
downloadtgif-7a738b40f67fc44c2a2c1abcffe474241af3d30e.tar.xz
Merge branch 'nd/worktree-cleanup-post-head-protection'
Further preparatory clean-up for "worktree" feature continues. * nd/worktree-cleanup-post-head-protection: worktree: simplify prefixing paths worktree: avoid 0{40}, too many zeroes, hard to read worktree.c: use is_dot_or_dotdot() git-worktree.txt: keep subcommand listing in alphabetical order worktree.c: rewrite mark_current_worktree() to avoid strbuf completion: support git-worktree
Diffstat (limited to 't/t7606-merge-custom.sh')
0 files changed, 0 insertions, 0 deletions