]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'nb/branch-show-other-worktrees-head'
authorJunio C Hamano <gitster@pobox.com>
Tue, 9 Jul 2019 22:25:33 +0000 (15:25 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 9 Jul 2019 22:25:33 +0000 (15:25 -0700)
commit99eea645832d376a3b214b78a57adabf1fa96547
tree523d1ade0aaa84b1ac0d9cda83a6e4b46f2a08d8
parent8dca754b1e874719a732bc9ab7b0e14b21b1bc10
parent6e9381469e3bd866e73affe6d9d96206ee7ff965
Merge branch 'nb/branch-show-other-worktrees-head'

"git branch --list" learned to show branches that are checked out
in other worktrees connected to the same repository prefixed with
'+', similar to the way the currently checked out branch is shown
with '*' in front.

* nb/branch-show-other-worktrees-head:
  branch: add worktree info on verbose output
  branch: update output to include worktree info
  ref-filter: add worktreepath atom
Documentation/git-branch.txt
builtin/branch.c
ref-filter.c
t/t3200-branch.sh
t/t3203-branch-output.sh