diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-08-26 00:57:08 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-08-26 00:57:08 +0300 |
| commit | 32561f5dd39da3ac720f6778bc2e8aafed771eb5 (patch) | |
| tree | c066f6a534665f2db781e6223544f9bbd31fe99c /sequencer.c | |
| parent | 5d5be8167db3bcaf9836cac7fdd785c564484e06 (diff) | |
| parent | b02e8595e263e284e45a6262b92ef158b6966478 (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
Diffstat (limited to 'sequencer.c')
0 files changed, 0 insertions, 0 deletions