diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-08-25 14:57:08 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-08-25 14:57:08 -0700 |
| commit | 32561f5dd39da3ac720f6778bc2e8aafed771eb5 (patch) | |
| tree | c066f6a534665f2db781e6223544f9bbd31fe99c /Documentation/diff-options.txt | |
| parent | Merge branch 'nd/dwim-wildcards-as-pathspecs' (diff) | |
| parent | notes: handle multiple worktrees (diff) | |
| download | tgif-32561f5dd39da3ac720f6778bc2e8aafed771eb5.tar.xz | |
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 'Documentation/diff-options.txt')
0 files changed, 0 insertions, 0 deletions