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
/
t3030-merge-recursive.sh
Age
Commit message (
Expand
)
Author
2018-07-17
t3030: fix broken &&-chains
Eric Sunshine
2018-02-28
t3030-merge-recursive: don't check the stderr of a subshell
SZEDER Gábor
2018-01-09
merge-recursive: do not look at the index during recursive merge
Junio C Hamano
2016-11-18
submodules: allow empty working-tree dirs in merge/cherry-pick
David Turner
2016-08-14
merge-recursive: fix verbose output for multiple base trees
René Scharfe
2015-12-28
t/t3030-merge-recursive.sh: use the $( ... ) construct for command substitution
Elia Pinto
2015-10-27
t6031: move triple-rename test to t3030
Jeff King
2014-02-25
merge-recursive.c: tolerate missing files while refreshing index
Brad King
2014-02-25
t3030-merge-recursive: test known breakage with empty work tree
Brad King
2013-06-08
t3030: use test_ln_s_add to remove SYMLINKS prerequisite
Johannes Sixt
2011-12-09
t3030 (merge-recursive): use test_expect_code
Ramkumar Ramachandra
2011-08-15
t3030: fix accidental success in symlink rename
Jeff King
2011-04-14
i18n: use test_i18ngrep in t2020, t2204, t3030, and t3200
Junio C Hamano
2011-03-10
i18n: git-merge "You have not concluded your merge" messages
Ævar Arnfjörð Bjarmason
2010-11-30
Merge branch 'en/merge-recursive'
Junio C Hamano
2010-11-09
tests: add missing &&
Jonathan Nieder
2010-09-30
t3030: Add a testcase for resolvable rename/add conflict with symlinks
Schalk, Ken
2010-09-15
Merge branch 'ks/recursive-rename-add-identical'
Junio C Hamano
2010-09-03
RE: [PATCH] Avoid rename/add conflict when contents are identical
Schalk, Ken
2010-08-11
unpack_trees: group error messages by type
Matthieu Moy
2010-06-11
merge-recursive: demonstrate an incorrect conflict with submodule
Johannes Sixt
2010-01-13
Be more user-friendly when refusing to do something because of conflict.
Matthieu Moy
2009-06-02
refuse to merge during a merge
Clemens Buchacher
2008-09-26
Remove empty directories in recursive merge
Alex Riesen
2008-09-03
tests: use "git xyzzy" form (t0000 - t3599)
Nanako Shiraishi
2008-08-24
merge: fix numerus bugs around "trivial merge" area
Junio C Hamano
2008-05-24
tests: do not use implicit "git diff --no-index"
Junio C Hamano
2007-06-07
War on whitespace
Junio C Hamano
2007-04-20
Remove case-sensitive file in t3030-merge-recursive.
Brian Gernhardt
2007-04-10
t3030: merge-recursive backend test.
Junio C Hamano