Merge branch 'nd/worktree-cleanup-post-head-protection'
commit7a738b40f67fc44c2a2c1abcffe474241af3d30e
authorJunio C Hamano <gitster@pobox.com>
Wed, 6 Jul 2016 20:38:11 +0000 (6 13:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 6 Jul 2016 20:38:11 +0000 (6 13:38 -0700)
tree38045c933a3d7247599a9d2f5ba0d981ea7a8832
parentf1e80a12a485c1d3092cef96aa4a101405d326f9
parent0409e0b6dc169b07c05d02e8b62389b1cc975a45
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
Documentation/git-worktree.txt
builtin/worktree.c
contrib/completion/git-completion.bash
worktree.c