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
2012-08-27
Fix tests under GETTEXT_POISON on parseopt
Jiang Xin
2012-02-10
merge: do not launch an editor on "--no-edit $tag"
Junio C Hamano
2012-02-06
merge: do not create a signed tag merge under --ff-only option
Junio C Hamano
2011-11-08
merge: record tag objects without peeling in MERGE_HEAD
Junio C Hamano
2011-11-08
merge: notice local merging of tags and keep it unwrapped
Junio C Hamano
2011-10-13
Teach merge the '[-e|--edit]' option
Jay Soffian
2011-05-17
Merge branch 'mg/merge-ff-config'
Junio C Hamano
2011-05-11
Merge branch 'jc/maint-branch-mergeoptions'
Junio C Hamano
2011-05-11
Merge branch 'jn/maint-test-merge-verify-parents'
Junio C Hamano
2011-05-07
tests: check git does not barf on merge.ff values for future versions of git
Jonathan Nieder
2011-05-07
tests: teach verify_parents to check for extra parents
Jonathan Nieder
2011-05-07
merge: introduce merge.ff configuration variable
Junio C Hamano
2011-05-07
Merge branch 'jc/maint-branch-mergeoptions' into mg/merge-ff-config
Junio C Hamano
2011-05-07
merge: make branch.<name>.mergeoptions correctly override merge.<option>
Junio C Hamano
2011-05-07
tests: eliminate unnecessary setup test assertions
Jonathan Nieder
2011-04-15
i18n: use test_i18n{cmp,grep} in t7600, t7607, t7611 and t7811
Junio C Hamano
2011-03-10
i18n: git-merge "Wonderful" message
Ævar Arnfjörð Bjarmason
2010-10-22
merge -h: show usage even with corrupt index
Nguyễn Thái Ngọc Duy
2010-08-19
t7600 (merge): test merge from branch yet to be born
Jonathan Nieder
2010-08-19
t7600 (merge): check reflog entry
Jonathan Nieder
2010-08-19
t7600 (merge): do not launch gitk for --debug
Jonathan Nieder
2010-08-19
t7600 (merge): modernize style
Jonathan Nieder
2010-08-19
merge: do not mistake (ancestor of) tag for branch
Jonathan Nieder
2010-04-07
war on "sleep" in tests
Junio C Hamano
2009-10-31
Teach 'git merge' and 'git pull' the option --ff-only
Björn Gustavsson
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
[next]