Junio C Hamano 32561f5dd3 Merge branch 'dt/notes-multiple' ...

When linked worktree is used, simultaneous "notes merge" instances
for the same ref in refs/notes/* are prevented from stomping on
each other.

* dt/notes-multiple:
  notes: handle multiple worktrees
  worktrees: add find_shared_symref

2015-08-25 14:57:08 -07:00

10 KiB

Raw Blame History

View Raw