Google Git
Sign in
googlers / jrn / git / b4bd6bb356795ef817d44d65c16bba7f192ab29e / t / t3310-notes-merge-manual-resolve.sh
  1. dabba59 notes-merge: Don't remove .git/NOTES_MERGE_WORKTREE; it may be the user's cwd by Johan Herland · 13 years ago
  2. a0be62c notes-merge: use opendir/readdir instead of using read_directory() by Johan Herland · 13 years ago
  3. 01bfec8 t3310: illustrate failure to "notes merge --commit" inside $GIT_DIR/ by Johan Herland · 13 years ago
  4. 0238038 test: fix '&&' chaining by Ramkumar Ramachandra · 13 years ago
  5. 6cfd6a9 git notes merge: --commit should fail if underlying notes ref has moved by Johan Herland · 14 years ago
  6. 443259c git notes merge: List conflicting notes in notes merge commit message by Johan Herland · 14 years ago
  7. 6abb365 git notes merge: Manual conflict resolution, part 2/2 by Johan Herland · 14 years ago
  8. 809f38c git notes merge: Manual conflict resolution, part 1/2 by Johan Herland · 14 years ago