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
/
t7600-merge.sh
Age
Commit message (
Expand
)
Author
2008-10-20
Merge branch 'mv/merge-noff'
Junio C Hamano
2008-10-17
Merge branch 'maint'
Junio C Hamano
2008-10-15
Add testcase to ensure merging an early part of a branch is done properly
Miklos Vajna
2008-10-03
builtin-commit: use reduce_heads() only when appropriate
Miklos Vajna
2008-10-03
builtin-merge: refresh the index before calling a strategy
Miklos Vajna
2008-09-04
Merge branch 'maint'
Junio C Hamano
2008-09-04
tests: use "git xyzzy" form (t7200 - t9001)
Nanako Shiraishi
2008-08-28
Merge branch 'mv/merge-custom'
Junio C Hamano
2008-08-24
merge: fix numerus bugs around "trivial merge" area
Junio C Hamano
2008-08-21
"git-merge": allow fast-forwarding in a stat-dirty tree
Junio C Hamano
2008-07-30
Add a second testcase for handling invalid strategies in git-merge
Miklos Vajna
2008-07-21
builtin-merge.c: Fix option parsing
Michele Ballabio
2008-07-17
Merge branch 'sb/dashless'
Junio C Hamano
2008-07-17
Merge branch 'maint'
Junio C Hamano
2008-07-17
t7600-merge: Use test_expect_failure to test option parsing
Johannes Sixt
2008-07-14
reduce_heads(): protect from duplicate input
Junio C Hamano
2008-07-14
reduce_heads(): thinkofix
Sverre Hvammen Johansen
2008-07-14
t/: Use "test_must_fail git" instead of "! git"
Stephan Beyer
2008-07-10
Teach merge.log to "git-merge" again
Junio C Hamano
2008-04-13
merge, pull: add '--(no-)log' command line option
SZEDER Gábor
2008-04-13
merge, pull: introduce '--(no-)stat' option
SZEDER Gábor
2008-03-13
add test_cmp function for test scripts
Jeff King
2008-03-13
remove use of "tail -n 1" and "tail -1"
Jeff King
2008-03-13
grep portability fix: don't use "-e" or "-q"
Jeff King
2008-03-04
git-merge.sh: better handling of combined --squash,--no-ff,--no-commit options
Gerrit Pape
2008-01-05
t/t7600: avoid GNUism in grep
Junio C Hamano
2007-09-24
git-merge: add --ff and --no-ff options
Lars Hjemli
2007-09-24
git-merge: add support for --commit and --no-squash
Lars Hjemli
2007-09-24
git-merge: add support for branch.<name>.mergeoptions
Lars Hjemli
2007-09-24
Add test-script for git-merge porcelain
Lars Hjemli