This version removes the old patch 2/6, which changed notes to use normal refs instead of pseudorefs. We don't actually want to forbid per-worktree notes merge; instead, we want to either ensure that they don't conflict, or use a completely different merge mechanism. So we omit this patch.
In addition, this version fixes a style issue reported by Eric Sunshine. It also fixes a lock leak and removes some redundant code; Eric also suggested both of these changes. It also corrects the word "rebase" with "bisect" in a commit message; Junio noticed this one. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
