summaryrefslogtreecommitdiff
path: root/t/t7600-merge.sh
AgeCommit message (Expand)Author
2010-08-18t7600 (merge): check reflog entryJonathan Nieder
2010-08-18t7600 (merge): do not launch gitk for --debugJonathan Nieder
2010-08-18t7600 (merge): modernize styleJonathan Nieder
2010-08-18merge: do not mistake (ancestor of) tag for branchJonathan Nieder
2010-04-07war on "sleep" in testsJunio C Hamano
2009-10-30Teach 'git merge' and 'git pull' the option --ff-onlyBjörn Gustavsson
2008-10-19Merge branch 'mv/merge-noff'Junio C Hamano
2008-10-17Merge branch 'maint'Junio C Hamano
2008-10-14Add testcase to ensure merging an early part of a branch is done properlyMiklos Vajna
2008-10-03builtin-commit: use reduce_heads() only when appropriateMiklos Vajna
2008-10-03builtin-merge: refresh the index before calling a strategyMiklos Vajna
2008-09-03Merge branch 'maint'Junio C Hamano
2008-09-03tests: use "git xyzzy" form (t7200 - t9001)Nanako Shiraishi
2008-08-28Merge branch 'mv/merge-custom'Junio C Hamano
2008-08-24merge: fix numerus bugs around "trivial merge" areaJunio C Hamano
2008-08-20"git-merge": allow fast-forwarding in a stat-dirty treeJunio C Hamano
2008-07-30Add a second testcase for handling invalid strategies in git-mergeMiklos Vajna
2008-07-20builtin-merge.c: Fix option parsingMichele Ballabio
2008-07-17Merge branch 'sb/dashless'Junio C Hamano
2008-07-17Merge branch 'maint'Junio C Hamano
2008-07-16t7600-merge: Use test_expect_failure to test option parsingJohannes Sixt
2008-07-14reduce_heads(): protect from duplicate inputJunio C Hamano
2008-07-13reduce_heads(): thinkofixSverre Hvammen Johansen
2008-07-13t/: Use "test_must_fail git" instead of "! git"Stephan Beyer
2008-07-10Teach merge.log to "git-merge" againJunio C Hamano
2008-04-13merge, pull: add '--(no-)log' command line optionSZEDER Gábor
2008-04-13merge, pull: introduce '--(no-)stat' optionSZEDER Gábor
2008-03-13add test_cmp function for test scriptsJeff King
2008-03-13remove use of "tail -n 1" and "tail -1"Jeff King
2008-03-13grep portability fix: don't use "-e" or "-q"Jeff King
2008-03-03git-merge.sh: better handling of combined --squash,--no-ff,--no-commit optionsGerrit Pape
2008-01-05t/t7600: avoid GNUism in grepJunio C Hamano
2007-09-24git-merge: add --ff and --no-ff optionsLars Hjemli
2007-09-24git-merge: add support for --commit and --no-squashLars Hjemli
2007-09-24git-merge: add support for branch.<name>.mergeoptionsLars Hjemli
2007-09-24Add test-script for git-merge porcelainLars Hjemli