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