Age | Commit message (Expand) | Author |
---|---|---|
2016-09-21 | i18n: notes-merge: mark die messages for translation | Vasco Almeida |
2016-06-17 | i18n: notes: mark strings for translation | Vasco Almeida |
2015-08-17 | notes: add tests for --commit/--abort/--strategy exclusivity | Jacob Keller |
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-17 | git notes merge: --commit should fail if underlying notes ref has moved | Johan Herland |
2010-11-17 | git notes merge: List conflicting notes in notes merge commit message | Johan Herland |
2010-11-17 | git notes merge: Manual conflict resolution, part 2/2 | Johan Herland |
2010-11-17 | git notes merge: Manual conflict resolution, part 1/2 | Johan Herland |