aboutsummaryrefslogtreecommitdiff
path: root/t/t7600-merge.sh
Commit message (Expand)AuthorAge
* merge: record tag objects without peeling in MERGE_HEADJunio C Hamano2011-11-08
* merge: notice local merging of tags and keep it unwrappedJunio C Hamano2011-11-07
* Teach merge the '[-e|--edit]' optionJay Soffian2011-10-12
* Merge branch 'mg/merge-ff-config'Junio C Hamano2011-05-16
|\
| * tests: check git does not barf on merge.ff values for future versions of gitJonathan Nieder2011-05-06
| * merge: introduce merge.ff configuration variableJunio C Hamano2011-05-06
| * Merge branch 'jc/maint-branch-mergeoptions' into mg/merge-ff-configJunio C Hamano2011-05-06
| |\
* | \ Merge branch 'jc/maint-branch-mergeoptions'Junio C Hamano2011-05-11
|\ \ \ | | |/ | |/|
| * | merge: make branch.<name>.mergeoptions correctly override merge.<option>Junio C Hamano2011-05-06
* | | Merge branch 'jn/maint-test-merge-verify-parents'Junio C Hamano2011-05-11
|\ \ \
| * | | tests: teach verify_parents to check for extra parentsJonathan Nieder2011-05-06
| * | | tests: eliminate unnecessary setup test assertionsJonathan Nieder2011-05-06
| | |/ | |/|
* | | i18n: use test_i18n{cmp,grep} in t7600, t7607, t7611 and t7811Junio C Hamano2011-04-14
|/ /
* | i18n: git-merge "Wonderful" messageÆvar Arnfjörð Bjarmason2011-03-09
* | merge -h: show usage even with corrupt indexNguyễn Thái Ngọc Duy2010-10-22
* | t7600 (merge): test merge from branch yet to be bornJonathan Nieder2010-08-18
* | t7600 (merge): check reflog entryJonathan Nieder2010-08-18
* | t7600 (merge): do not launch gitk for --debugJonathan Nieder2010-08-18
* | t7600 (merge): modernize styleJonathan Nieder2010-08-18
* | merge: do not mistake (ancestor of) tag for branchJonathan Nieder2010-08-18
* | war on "sleep" in testsJunio C Hamano2010-04-06
|/
* Teach 'git merge' and 'git pull' the option --ff-onlyBjörn Gustavsson2009-10-30
* Merge branch 'mv/merge-noff'Junio C Hamano2008-10-19
|\
| * builtin-commit: use reduce_heads() only when appropriateMiklos Vajna2008-10-03
* | Merge branch 'maint'Junio C Hamano2008-10-17
|\ \
| * | Add testcase to ensure merging an early part of a branch is done properlyMiklos Vajna2008-10-14
* | | builtin-merge: refresh the index before calling a strategyMiklos Vajna2008-10-03
| |/ |/|
* | Merge branch 'maint'Junio C Hamano2008-09-03
|\ \ | |/
| * tests: use "git xyzzy" form (t7200 - t9001)Nanako Shiraishi2008-09-03
* | Merge branch 'mv/merge-custom'Junio C Hamano2008-08-27
|\ \ | |/ |/|
| * Add a second testcase for handling invalid strategies in git-mergeMiklos Vajna2008-07-29
* | merge: fix numerus bugs around "trivial merge" areaJunio C Hamano2008-08-23
* | "git-merge": allow fast-forwarding in a stat-dirty treeJunio C Hamano2008-08-20
|/
* builtin-merge.c: Fix option parsingMichele Ballabio2008-07-20
* Merge branch 'sb/dashless'Junio C Hamano2008-07-16
|\
| * t/: Use "test_must_fail git" instead of "! git"Stephan Beyer2008-07-13
* | Merge branch 'maint'Junio C Hamano2008-07-16
|\ \
| * | t7600-merge: Use test_expect_failure to test option parsingJohannes Sixt2008-07-16
| |/
* | reduce_heads(): protect from duplicate inputJunio C Hamano2008-07-14
* | reduce_heads(): thinkofixSverre Hvammen Johansen2008-07-13
* | Teach merge.log to "git-merge" againJunio C Hamano2008-07-10
|/
* merge, pull: add '--(no-)log' command line optionSZEDER Gábor2008-04-12
* merge, pull: introduce '--(no-)stat' optionSZEDER Gábor2008-04-12
* add test_cmp function for test scriptsJeff King2008-03-13
* remove use of "tail -n 1" and "tail -1"Jeff King2008-03-13
* grep portability fix: don't use "-e" or "-q"Jeff King2008-03-13
* git-merge.sh: better handling of combined --squash,--no-ff,--no-commit optionsGerrit Pape2008-03-03
* t/t7600: avoid GNUism in grepJunio C Hamano2008-01-05
* git-merge: add --ff and --no-ff optionsLars Hjemli2007-09-23
* git-merge: add support for --commit and --no-squashLars Hjemli2007-09-23
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-28 04:14:58 +0000