summaryrefslogtreecommitdiff
path: root/t/t7600-merge.sh
AgeCommit message (Expand)AuthorFilesLines
2019-07-25Merge branch 'vv/merge-squash-with-explicit-commit' into maintLibravatar Junio C Hamano1-0/+6
2019-05-28merge: refuse --commit with --squashLibravatar Vishal Verma1-0/+6
2019-04-18merge: add scissors line on merge conflictLibravatar Denton Liu1-0/+46
2019-04-18t7600: clean up styleLibravatar Denton Liu1-14/+13
2018-08-21tests: use 'test_must_be_empty' instead of 'test_cmp <empty> <out>'Libravatar SZEDER Gábor1-6/+3
2018-02-16merge: allow fast-forward when merging a tracked tagLibravatar Junio C Hamano1-1/+37
2017-10-07tests: fix diff order arguments in test_cmpLibravatar Stefan Beller1-3/+3
2017-08-23merge: save merge state earlierLibravatar Michael J Gruber1-0/+15
2016-12-14merge: ensure '--abort' option takes no argumentsLibravatar Chris Packham1-0/+2
2016-12-14merge: add '--continue' option as a synonym for 'git commit'Libravatar Chris Packham1-0/+9
2016-04-06Merge branch 'jv/merge-nothing-into-void'Libravatar Junio C Hamano1-0/+10
2016-04-06Merge branch 'ss/commit-squash-msg'Libravatar Junio C Hamano1-0/+28
2016-03-23merge: fix NULL pointer dereference when merging nothing into voidLibravatar Junio C Hamano1-0/+10
2016-03-21commit: do not lose SQUASH_MSG contentsLibravatar Sven Strickroth1-0/+28
2015-10-30Merge branch 'jk/merge-file-exit-code'Libravatar Junio C Hamano1-0/+33
2015-10-29merge-file: clamp exit code to maximum 127Libravatar Jeff King1-0/+33
2015-03-20t: fix trivial &&-chain breakageLibravatar Jeff King1-1/+1
2014-05-15git-show: fix 'git show -s' to not add extra terminator after merge commitLibravatar Max Kirillov1-6/+5
2013-07-23t7600: fix typo in test titleLibravatar Junio C Hamano1-1/+1
2013-07-02merge: handle --ff/--no-ff/--ff-only as a tri-state optionLibravatar Miklos Vajna1-3/+9
2013-06-26Merge branch 'vl/typofix'Libravatar Junio C Hamano1-1/+1
2013-06-19random typofixes (committed missing a 't', successful missing an 's')Libravatar Veres Lajos1-1/+1
2013-03-25t7600: use test_config to set/unset git config variablesLibravatar Yann Droneaud1-34/+26
2012-08-27Fix tests under GETTEXT_POISON on parseoptLibravatar Jiang Xin1-1/+1
2012-02-09merge: do not launch an editor on "--no-edit $tag"Libravatar Junio C Hamano1-0/+12
2012-02-05merge: do not create a signed tag merge under --ff-only optionLibravatar Junio C Hamano1-0/+13
2011-11-08merge: record tag objects without peeling in MERGE_HEADLibravatar Junio C Hamano1-1/+5
2011-11-07merge: notice local merging of tags and keep it unwrappedLibravatar Junio C Hamano1-3/+3
2011-10-12Teach merge the '[-e|--edit]' optionLibravatar Jay Soffian1-0/+23
2011-05-16Merge branch 'mg/merge-ff-config'Libravatar Junio C Hamano1-6/+58
2011-05-11Merge branch 'jc/maint-branch-mergeoptions'Libravatar Junio C Hamano1-0/+32
2011-05-11Merge branch 'jn/maint-test-merge-verify-parents'Libravatar Junio C Hamano1-74/+73
2011-05-06tests: check git does not barf on merge.ff values for future versions of gitLibravatar Jonathan Nieder1-2/+14
2011-05-06tests: teach verify_parents to check for extra parentsLibravatar Jonathan Nieder1-0/+1
2011-05-06merge: introduce merge.ff configuration variableLibravatar Junio C Hamano1-2/+41
2011-05-06Merge branch 'jc/maint-branch-mergeoptions' into mg/merge-ff-configLibravatar Junio C Hamano1-0/+33
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 07:40:48 +0000