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
/
t6044-merge-unrelated-index-changes.sh
Age
Commit message (
Expand
)
Author
2020-08-11
Collect merge-related tests to t64xx
Elijah Newren
2018-07-11
merge-recursive: enforce rule that index matches head before merging
Elijah Newren
2018-07-11
t6044: add more testcases with staged changes before a merge is invoked
Elijah Newren
2018-07-11
merge-recursive: fix assumption that head tree being merged is HEAD
Elijah Newren
2018-07-11
merge-recursive: make sure when we say we abort that we actually abort
Elijah Newren
2018-07-11
t6044: add a testcase for index matching head, when head doesn't match HEAD
Elijah Newren
2018-07-03
t6044: verify that merges expected to abort actually abort
Elijah Newren
2017-12-22
merge-recursive: avoid incorporating uncommitted changes in a merge
Elijah Newren
2017-12-22
t6044: recursive can silently incorporate dirty changes in a merge
Elijah Newren
2016-05-30
Merge branch 'js/t6044-use-test-seq'
Junio C Hamano
2016-05-18
t6044: replace seq by test_seq
Johannes Sixt
2016-04-13
t6044: new merge testcases for when index doesn't match HEAD
Elijah Newren
2016-04-13
merge-octopus: abort if index does not match HEAD
Elijah Newren