Age | Commit message (Expand) | Author |
---|---|---|
2012-03-15 | notes-merge: Don't remove .git/NOTES_MERGE_WORKTREE; it may be the user's cwd | Johan Herland |
2012-03-15 | notes-merge: use opendir/readdir instead of using read_directory() | Johan Herland |
2012-03-15 | t3310: illustrate failure to "notes merge --commit" inside $GIT_DIR/ | Johan Herland |
2011-12-09 | test: fix '&&' chaining | Ramkumar Ramachandra |
2010-11-18 | git notes merge: --commit should fail if underlying notes ref has moved | Johan Herland |
2010-11-18 | git notes merge: List conflicting notes in notes merge commit message | Johan Herland |
2010-11-18 | git notes merge: Manual conflict resolution, part 2/2 | Johan Herland |
2010-11-18 | git notes merge: Manual conflict resolution, part 1/2 | Johan Herland |