summaryrefslogtreecommitdiff
path: root/t/t3310-notes-merge-manual-resolve.sh
Commit message (Expand)AuthorAgeFilesLines
* i18n: notes-merge: mark die messages for translationVasco Almeida2016-09-211-1/+1
* i18n: notes: mark strings for translationVasco Almeida2016-06-171-4/+4
* notes: add tests for --commit/--abort/--strategy exclusivityJacob Keller2015-08-171-0/+12
* notes-merge: Don't remove .git/NOTES_MERGE_WORKTREE; it may be the user's cwdjh/notes-merge-in-git-dir-worktreeJohan Herland2012-03-151-4/+4
* notes-merge: use opendir/readdir instead of using read_directory()Johan Herland2012-03-151-1/+1
* t3310: illustrate failure to "notes merge --commit" inside $GIT_DIR/Johan Herland2012-03-151-0/+19
* test: fix '&&' chainingRamkumar Ramachandra2011-12-081-5/+5
* git notes merge: --commit should fail if underlying notes ref has movedJohan Herland2010-11-171-0/+76
* git notes merge: List conflicting notes in notes merge commit messageJohan Herland2010-11-171-0/+12
* git notes merge: Manual conflict resolution, part 2/2Johan Herland2010-11-171-0/+176
* git notes merge: Manual conflict resolution, part 1/2Johan Herland2010-11-171-0/+292