Age | Commit message (Expand) | Author | Files | Lines |
2018-08-27 | Merge branch 'sg/test-must-be-empty' | Junio C Hamano | 1 | -4/+4 |
2018-08-21 | tests: use 'test_must_be_empty' instead of 'test_cmp /dev/null <out>' | SZEDER Gábor | 1 | -4/+4 |
2018-07-23 | refs.c: mark more strings for translation | Nguyễn Thái Ngọc Duy | 1 | -3/+3 |
2017-11-15 | notes: send "Automatic notes merge failed" messages to stderr | Todd Zullinger | 1 | -4/+4 |
2016-09-21 | i18n: notes-merge: mark die messages for translation | Vasco Almeida | 1 | -1/+1 |
2016-06-17 | i18n: notes: mark strings for translation | Vasco Almeida | 1 | -4/+4 |
2015-08-17 | notes: add tests for --commit/--abort/--strategy exclusivity | Jacob Keller | 1 | -0/+12 |
2012-03-15 | notes-merge: Don't remove .git/NOTES_MERGE_WORKTREE; it may be the user's cwd | Johan Herland | 1 | -4/+4 |
2012-03-15 | notes-merge: use opendir/readdir instead of using read_directory() | Johan Herland | 1 | -1/+1 |
2012-03-15 | t3310: illustrate failure to "notes merge --commit" inside $GIT_DIR/ | Johan Herland | 1 | -0/+19 |
2011-12-08 | test: fix '&&' chaining | Ramkumar Ramachandra | 1 | -5/+5 |
2010-11-17 | git notes merge: --commit should fail if underlying notes ref has moved | Johan Herland | 1 | -0/+76 |
2010-11-17 | git notes merge: List conflicting notes in notes merge commit message | Johan Herland | 1 | -0/+12 |
2010-11-17 | git notes merge: Manual conflict resolution, part 2/2 | Johan Herland | 1 | -0/+176 |
2010-11-17 | git notes merge: Manual conflict resolution, part 1/2 | Johan Herland | 1 | -0/+292 |