summaryrefslogtreecommitdiff
path: root/t/t7600-merge.sh
AgeCommit message (Expand)AuthorFilesLines
2011-05-06merge: make branch.<name>.mergeoptions correctly override merge.<option>Libravatar Junio C Hamano1-0/+32
2011-05-06tests: eliminate unnecessary setup test assertionsLibravatar Jonathan Nieder1-74/+72
2011-04-14i18n: use test_i18n{cmp,grep} in t7600, t7607, t7611 and t7811Libravatar Junio C Hamano1-2/+2
2011-03-09i18n: git-merge "Wonderful" messageLibravatar Ævar Arnfjörð Bjarmason1-1/+1
2010-10-22merge -h: show usage even with corrupt indexLibravatar Nguyễn Thái Ngọc Duy1-0/+11
2010-08-18t7600 (merge): test merge from branch yet to be bornLibravatar Jonathan Nieder1-0/+21
2010-08-18t7600 (merge): check reflog entryLibravatar Jonathan Nieder1-1/+7
2010-08-18t7600 (merge): do not launch gitk for --debugLibravatar Jonathan Nieder1-29/+29
2010-08-18t7600 (merge): modernize styleLibravatar Jonathan Nieder1-187/+101
2010-08-18merge: do not mistake (ancestor of) tag for branchLibravatar Jonathan Nieder1-4/+12
2010-04-06war on "sleep" in testsLibravatar Junio C Hamano1-2/+1
2009-10-30Teach 'git merge' and 'git pull' the option --ff-onlyLibravatar Björn Gustavsson1-0/+41
2008-10-19Merge branch 'mv/merge-noff'Libravatar Junio C Hamano1-0/+16
2008-10-17Merge branch 'maint'Libravatar Junio C Hamano1-0/+24
2008-10-14Add testcase to ensure merging an early part of a branch is done properlyLibravatar Miklos Vajna1-0/+26
2008-10-03builtin-commit: use reduce_heads() only when appropriateLibravatar Miklos Vajna1-0/+16
2008-10-03builtin-merge: refresh the index before calling a strategyLibravatar Miklos Vajna1-0/+9
2008-09-03Merge branch 'maint'Libravatar Junio C Hamano1-1/+1
2008-09-03tests: use "git xyzzy" form (t7200 - t9001)Libravatar Nanako Shiraishi1-1/+1
2008-08-27Merge branch 'mv/merge-custom'Libravatar Junio C Hamano1-0/+4
2008-08-23merge: fix numerus bugs around "trivial merge" areaLibravatar Junio C Hamano1-0/+9
2008-08-20"git-merge": allow fast-forwarding in a stat-dirty treeLibravatar Junio C Hamano1-0/+10
2008-07-29Add a second testcase for handling invalid strategies in git-mergeLibravatar Miklos Vajna1-0/+4
2008-07-20builtin-merge.c: Fix option parsingLibravatar Michele Ballabio1-1/+1
2008-07-16Merge branch 'sb/dashless'Libravatar Junio C Hamano1-1/+1
2008-07-16Merge branch 'maint'Libravatar Junio C Hamano1-31/+7
2008-07-16t7600-merge: Use test_expect_failure to test option parsingLibravatar Johannes Sixt1-30/+6
2008-07-14reduce_heads(): protect from duplicate inputLibravatar Junio C Hamano1-0/+22
2008-07-13reduce_heads(): thinkofixLibravatar Sverre Hvammen Johansen1-0/+11
2008-07-13t/: Use "test_must_fail git" instead of "! git"Libravatar Stephan Beyer1-1/+1
2008-07-10Teach merge.log to "git-merge" againLibravatar Junio C Hamano1-0/+7
2008-04-12merge, pull: add '--(no-)log' command line optionLibravatar SZEDER Gábor1-1/+15
2008-04-12merge, pull: introduce '--(no-)stat' optionLibravatar SZEDER Gábor1-4/+19
2008-03-13add test_cmp function for test scriptsLibravatar Jeff King1-1/+1
2008-03-13remove use of "tail -n 1" and "tail -1"Libravatar Jeff King1-1/+1
2008-03-13grep portability fix: don't use "-e" or "-q"Libravatar Jeff King1-2/+2
2008-03-03git-merge.sh: better handling of combined --squash,--no-ff,--no-commit optionsLibravatar Gerrit Pape1-0/+6
2008-01-05t/t7600: avoid GNUism in grepLibravatar Junio C Hamano1-2/+2
2007-09-23git-merge: add --ff and --no-ff optionsLibravatar Lars Hjemli1-0/+20
2007-09-23git-merge: add support for --commit and --no-squashLibravatar Lars Hjemli1-0/+22
2007-09-23git-merge: add support for branch.<name>.mergeoptionsLibravatar Lars Hjemli1-0/+54
2007-09-23Add test-script for git-merge porcelainLibravatar Lars Hjemli1-0/+344
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-01 07:34:38 +0000