aboutsummaryrefslogtreecommitdiff
path: root/t/t3310-notes-merge-manual-resolve.sh
Commit message (Expand)AuthorAge
* notes: send "Automatic notes merge failed" messages to stderrTodd Zullinger2017-11-15
* i18n: notes-merge: mark die messages for translationVasco Almeida2016-09-21
* i18n: notes: mark strings for translationVasco Almeida2016-06-17
* notes: add tests for --commit/--abort/--strategy exclusivityJacob Keller2015-08-17
* notes-merge: Don't remove .git/NOTES_MERGE_WORKTREE; it may be the user's cwdJohan Herland2012-03-15
* notes-merge: use opendir/readdir instead of using read_directory()Johan Herland2012-03-15
* t3310: illustrate failure to "notes merge --commit" inside $GIT_DIR/Johan Herland2012-03-15
* test: fix '&&' chainingRamkumar Ramachandra2011-12-08
* git notes merge: --commit should fail if underlying notes ref has movedJohan Herland2010-11-17
* git notes merge: List conflicting notes in notes merge commit messageJohan Herland2010-11-17
* git notes merge: Manual conflict resolution, part 2/2Johan Herland2010-11-17
* git notes merge: Manual conflict resolution, part 1/2Johan Herland2010-11-17
generated by cgit v1.2.1 (git 2.18.0) at 2024-05-20 20:44:02 +0000