aboutsummaryrefslogtreecommitdiffstats
path: root/t/t7601-merge-pull-config.sh (follow)
AgeCommit message (Expand)AuthorFilesLines
2024-11-21t: remove TEST_PASSES_SANITIZE_LEAK annotationsPatrick Steinhardt1-1/+0
2024-10-24t: fix typosAndrew Kreimer1-1/+1
2024-09-27builtin/pull: fix leaking "ff" optionPatrick Steinhardt1-0/+1
2023-11-08Merge branch 'jc/test-i18ngrep'Junio C Hamano1-25/+25
2023-11-02tests: teach callers of test_i18ngrep to use test_grepJunio C Hamano1-25/+25
2023-10-18t7601: use "test_path_is_file" etc. instead of "test -f"Dorcas AnonoLitunya1-12/+12
2021-11-18pull: should be noop when already-up-to-dateErwin Villejo1-0/+6
2021-10-29pull: --ff-only should make it a noop when already-up-to-dateJunio C Hamano1-1/+15
2021-07-22pull: fix handling of multiple headsElijah Newren1-1/+1
2021-07-22pull: abort by default when fast-forwarding is not possibleElijah Newren1-24/+24
2021-07-22pull: make --rebase and --no-rebase override pull.ff=onlyElijah Newren1-2/+2
2021-07-20pull: abort if --ff-only is given and fast-forwarding is impossibleAlex Henrie1-5/+5
2021-07-20t7601: add tests of interactions with multiple merge heads and configElijah Newren1-0/+22
2021-07-20t7601: test interaction of merge/rebase/fast-forward flags and optionsElijah Newren1-0/+182
2020-12-15pull: display default warning only when non-ffFelipe Contreras1-5/+61
2020-11-19pull: colorize the hint about setting `pull.rebase`Johannes Schindelin1-2/+5
2020-09-24pull: don't warn if pull.ff has been setAlex Henrie1-1/+20
2020-03-10pull: warn if the user didn't say whether to rebase or to mergeAlex Henrie1-0/+38
2015-05-18pull: make pull.ff=true override merge.ffPaul Tan1-0/+8
2014-01-15pull: add pull.ff configurationDavid Aguilar1-0/+21
2013-07-29many small typofixesOndřej Bílka1-1/+1
2013-04-12Correct common spelling mistakes in comments and testsStefano Lattarini1-1/+1
2010-10-06t7601 (merge-pull-config): add missing &&Elijah Newren1-6/+6
2008-09-03tests: use "git xyzzy" form (t7200 - t9001)Nanako Shiraishi1-1/+1
2008-07-23t7601: extend the 'merge picks up the best result' testMiklos Vajna1-0/+15
2008-07-21builtin-merge: give a proper error message for invalid strategies in configMiklos Vajna1-0/+12
2008-07-06Fix t7601-merge-pull-config.sh on AIXMiklos Vajna1-7/+7
2008-06-30Add new test to ensure git-merge handles pull.twohead and pull.octopusMiklos Vajna1-0/+129
generated by cgit v1.2.3 (git 2.39.1) at 2026-01-09 18:23:51 +0000