summaryrefslogtreecommitdiff
path: root/t/t7600-merge.sh
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'mg/merge-ff-config'Junio C Hamano2011-05-161-6/+58
|\
| * tests: check git does not barf on merge.ff values for future versions of gitJonathan Nieder2011-05-061-2/+14
| * merge: introduce merge.ff configuration variableJunio C Hamano2011-05-061-2/+41
| * Merge branch 'jc/maint-branch-mergeoptions' into mg/merge-ff-configJunio C Hamano2011-05-061-0/+33
| |\
* | \ Merge branch 'jc/maint-branch-mergeoptions'Junio C Hamano2011-05-111-0/+32
|\ \ \ | | |/ | |/|
| * | merge: make branch.<name>.mergeoptions correctly override merge.<option>Junio C Hamano2011-05-061-0/+32
* | | Merge branch 'jn/maint-test-merge-verify-parents'Junio C Hamano2011-05-111-74/+73
|\ \ \
| * | | tests: teach verify_parents to check for extra parentsJonathan Nieder2011-05-061-0/+1
| * | | tests: eliminate unnecessary setup test assertionsJonathan Nieder2011-05-061-74/+72
| | |/ | |/|
* | | i18n: use test_i18n{cmp,grep} in t7600, t7607, t7611 and t7811Junio C Hamano2011-04-141-2/+2
|/ /
* | i18n: git-merge "Wonderful" messageÆvar Arnfjörð Bjarmason2011-03-091-1/+1
* | merge -h: show usage even with corrupt indexNguyễn Thái Ngọc Duy2010-10-221-0/+11
* | t7600 (merge): test merge from branch yet to be bornJonathan Nieder2010-08-181-0/+21
* | t7600 (merge): check reflog entryJonathan Nieder2010-08-181-1/+7
* | t7600 (merge): do not launch gitk for --debugJonathan Nieder2010-08-181-29/+29
* | t7600 (merge): modernize styleJonathan Nieder2010-08-181-187/+101
* | merge: do not mistake (ancestor of) tag for branchJonathan Nieder2010-08-181-4/+12
* | war on "sleep" in testsJunio C Hamano2010-04-061-2/+1
|/
* Teach 'git merge' and 'git pull' the option --ff-onlyBjörn Gustavsson2009-10-301-0/+41
* Merge branch 'mv/merge-noff'Junio C Hamano2008-10-191-0/+16
|\
| * builtin-commit: use reduce_heads() only when appropriateMiklos Vajna2008-10-031-0/+16
* | Merge branch 'maint'Junio C Hamano2008-10-171-0/+24
|\ \
| * | Add testcase to ensure merging an early part of a branch is done properlyMiklos Vajna2008-10-141-0/+26
* | | builtin-merge: refresh the index before calling a strategyMiklos Vajna2008-10-031-0/+9
| |/ |/|
* | Merge branch 'maint'Junio C Hamano2008-09-031-1/+1
|\ \ | |/
| * tests: use "git xyzzy" form (t7200 - t9001)Nanako Shiraishi2008-09-031-1/+1
* | Merge branch 'mv/merge-custom'Junio C Hamano2008-08-271-0/+4
|\ \ | |/ |/|
| * Add a second testcase for handling invalid strategies in git-mergeMiklos Vajna2008-07-291-0/+4
* | merge: fix numerus bugs around "trivial merge" areaJunio C Hamano2008-08-231-0/+9
* | "git-merge": allow fast-forwarding in a stat-dirty treeJunio C Hamano2008-08-201-0/+10
|/
* builtin-merge.c: Fix option parsingMichele Ballabio2008-07-201-1/+1
* Merge branch 'sb/dashless'Junio C Hamano2008-07-161-1/+1
|\
| * t/: Use "test_must_fail git" instead of "! git"Stephan Beyer2008-07-131-1/+1
* | Merge branch 'maint'Junio C Hamano2008-07-161-31/+7
|\ \
| * | t7600-merge: Use test_expect_failure to test option parsingJohannes Sixt2008-07-161-30/+6
| |/
* | reduce_heads(): protect from duplicate inputJunio C Hamano2008-07-141-0/+22
* | reduce_heads(): thinkofixSverre Hvammen Johansen2008-07-131-0/+11
* | Teach merge.log to "git-merge" againJunio C Hamano2008-07-101-0/+7
|/
* merge, pull: add '--(no-)log' command line optionSZEDER Gábor2008-04-121-1/+15
* merge, pull: introduce '--(no-)stat' optionSZEDER Gábor2008-04-121-4/+19
* add test_cmp function for test scriptsJeff King2008-03-131-1/+1
* remove use of "tail -n 1" and "tail -1"Jeff King2008-03-131-1/+1
* grep portability fix: don't use "-e" or "-q"Jeff King2008-03-131-2/+2
* git-merge.sh: better handling of combined --squash,--no-ff,--no-commit optionsGerrit Pape2008-03-031-0/+6
* t/t7600: avoid GNUism in grepJunio C Hamano2008-01-051-2/+2
* git-merge: add --ff and --no-ff optionsLars Hjemli2007-09-231-0/+20
* git-merge: add support for --commit and --no-squashLars Hjemli2007-09-231-0/+22
* git-merge: add support for branch.<name>.mergeoptionsLars Hjemli2007-09-231-0/+54
* Add test-script for git-merge porcelainLars Hjemli2007-09-231-0/+344
View Lorry Controller Status