summaryrefslogtreecommitdiff
path: root/t/t7600-merge.sh
AgeCommit message (Expand)Author
2021-09-12tests: remove leftover untracked filesElijah Newren
2021-07-23merge: apply autostash if merge strategy failsPhilippe Blain
2021-07-23merge: apply autostash if fast-forward failsPhilippe Blain
2021-02-11tests: remove most uses of test_i18ncmpÆvar Arnfjörð Bjarmason
2020-11-19t7[5-9]*: adjust the references to the default branch name "main"Johannes Schindelin
2020-11-19tests: mark tests relying on the current default for `init.defaultBranch`Johannes Schindelin
2020-08-06t: don't spuriously close and reopen quotesMartin Ågren
2020-07-30Revert "fmt-merge-msg: stop treating `master` specially"Junio C Hamano
2020-06-24fmt-merge-msg: stop treating `master` speciallyJohannes Schindelin
2020-04-10merge: teach --autostash optionDenton Liu
2020-03-24t7600: use test_write_lines()Denton Liu
2019-06-17Merge branch 'vv/merge-squash-with-explicit-commit'Junio C Hamano
2019-06-13Merge branch 'jk/help-unknown-ref-fix'Junio C Hamano
2019-06-13Merge branch 'nd/merge-quit'Junio C Hamano
2019-05-28merge: refuse --commit with --squashVishal Verma
2019-05-19merge: add --quitNguyễn Thái Ngọc Duy
2019-05-15help_unknown_ref(): check for refname ambiguityJeff King
2019-05-15help_unknown_ref(): duplicate collected refnamesJeff King
2019-04-18merge: add scissors line on merge conflictDenton Liu
2019-04-18t7600: clean up styleDenton Liu
2018-08-21tests: use 'test_must_be_empty' instead of 'test_cmp <empty> <out>'SZEDER Gábor
2018-02-16merge: allow fast-forward when merging a tracked tagJunio C Hamano
2017-10-07tests: fix diff order arguments in test_cmpStefan Beller
2017-08-23merge: save merge state earlierMichael J Gruber
2016-12-14merge: ensure '--abort' option takes no argumentsChris Packham
2016-12-14merge: add '--continue' option as a synonym for 'git commit'Chris Packham
2016-04-06Merge branch 'jv/merge-nothing-into-void'Junio C Hamano
2016-04-06Merge branch 'ss/commit-squash-msg'Junio C Hamano
2016-03-23merge: fix NULL pointer dereference when merging nothing into voidJunio C Hamano
2016-03-21commit: do not lose SQUASH_MSG contentsSven Strickroth
2015-10-30Merge branch 'jk/merge-file-exit-code'Junio C Hamano
2015-10-29merge-file: clamp exit code to maximum 127Jeff King
2015-03-20t: fix trivial &&-chain breakageJeff King
2014-05-15git-show: fix 'git show -s' to not add extra terminator after merge commitMax Kirillov
2013-07-23t7600: fix typo in test titleJunio C Hamano
2013-07-02merge: handle --ff/--no-ff/--ff-only as a tri-state optionMiklos Vajna
2013-06-26Merge branch 'vl/typofix'Junio C Hamano
2013-06-19random typofixes (committed missing a 't', successful missing an 's')Veres Lajos
2013-03-25t7600: use test_config to set/unset git config variablesYann Droneaud
2012-08-27Fix tests under GETTEXT_POISON on parseoptJiang Xin
2012-02-09merge: do not launch an editor on "--no-edit $tag"Junio C Hamano
2012-02-06merge: do not create a signed tag merge under --ff-only optionJunio C Hamano
2011-11-08merge: record tag objects without peeling in MERGE_HEADJunio C Hamano
2011-11-07merge: notice local merging of tags and keep it unwrappedJunio C Hamano
2011-10-12Teach merge the '[-e|--edit]' optionJay Soffian
2011-05-16Merge branch 'mg/merge-ff-config'Junio C Hamano
2011-05-11Merge branch 'jc/maint-branch-mergeoptions'Junio C Hamano
2011-05-11Merge branch 'jn/maint-test-merge-verify-parents'Junio C Hamano
2011-05-06tests: check git does not barf on merge.ff values for future versions of gitJonathan Nieder
2011-05-06tests: teach verify_parents to check for extra parentsJonathan Nieder