9 Commits (23f8239bbe0a893bd8754a03e9d4fda62804ac14)

Author SHA1 Message Date
Jacob Keller 11dd2b2e9a notes: add tests for --commit/--abort/--strategy exclusivity 10 years ago
Johan Herland dabba590aa notes-merge: Don't remove .git/NOTES_MERGE_WORKTREE; it may be the user's cwd 13 years ago
Johan Herland a0be62c100 notes-merge: use opendir/readdir instead of using read_directory() 13 years ago
Johan Herland 01bfec8e52 t3310: illustrate failure to "notes merge --commit" inside $GIT_DIR/ 13 years ago
Ramkumar Ramachandra 02380389c6 test: fix '&&' chaining 13 years ago
Johan Herland 6cfd6a9dea git notes merge: --commit should fail if underlying notes ref has moved 15 years ago
Johan Herland 443259cf92 git notes merge: List conflicting notes in notes merge commit message 15 years ago
Johan Herland 6abb3655ef git notes merge: Manual conflict resolution, part 2/2 15 years ago
Johan Herland 809f38c8ab git notes merge: Manual conflict resolution, part 1/2 15 years ago