My Various Git Projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5d5be81 b02e859)
Merge branch 'dt/notes-multiple'
authorJunio C Hamano <gitster@pobox.com>
Tue, 25 Aug 2015 21:57:08 +0000 (14:57 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 25 Aug 2015 21:57:08 +0000 (14:57 -0700)
commit32561f5dd39da3ac720f6778bc2e8aafed771eb5
treec066f6a534665f2db781e6223544f9bbd31fe99ctree | snapshot
parent5d5be8167db3bcaf9836cac7fdd785c564484e06commit | diff
parentb02e8595e263e284e45a6262b92ef158b6966478commit | diff
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
branch.c diff1 | diff2 | blob | history
builtin/notes.c diff1 | diff2 | blob | history
The core git plumbing