Welcome to
mirror list
, hosted at
ThFree Co
, Russian Federation.
git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
index
:
git.kernel.org/pub/scm/git/git.git
main
maint
master
next
seen
todo
Unnamed repository; edit this file 'description' to name the repository.
root
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
t
/
t3310-notes-merge-manual-resolve.sh
Age
Commit message (
Expand
)
Author
2018-08-28
Merge branch 'sg/test-must-be-empty'
Junio C Hamano
2018-08-21
tests: use 'test_must_be_empty' instead of 'test_cmp /dev/null <out>'
SZEDER Gábor
2018-07-23
refs.c: mark more strings for translation
Nguyễn Thái Ngọc Duy
2017-11-15
notes: send "Automatic notes merge failed" messages to stderr
Todd Zullinger
2016-09-21
i18n: notes-merge: mark die messages for translation
Vasco Almeida
2016-06-18
i18n: notes: mark strings for translation
Vasco Almeida
2015-08-18
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-18
git notes merge: --commit should fail if underlying notes ref has moved
Johan Herland
2010-11-18
git notes merge: List conflicting notes in notes merge commit message
Johan Herland
2010-11-18
git notes merge: Manual conflict resolution, part 2/2
Johan Herland
2010-11-18
git notes merge: Manual conflict resolution, part 1/2
Johan Herland