summaryrefslogtreecommitdiff
path: root/t/t7601-merge-pull-config.sh
AgeCommit message (Expand)AuthorFilesLines
2021-11-18pull: should be noop when already-up-to-dateLibravatar Erwin Villejo1-0/+6
2021-10-29pull: --ff-only should make it a noop when already-up-to-dateLibravatar Junio C Hamano1-1/+15
2021-07-22pull: fix handling of multiple headsLibravatar Elijah Newren1-1/+1
2021-07-22pull: abort by default when fast-forwarding is not possibleLibravatar Elijah Newren1-24/+24
2021-07-22pull: make --rebase and --no-rebase override pull.ff=onlyLibravatar Elijah Newren1-2/+2
2021-07-20pull: abort if --ff-only is given and fast-forwarding is impossibleLibravatar Alex Henrie1-5/+5
2021-07-20t7601: add tests of interactions with multiple merge heads and configLibravatar Elijah Newren1-0/+22
2021-07-20t7601: test interaction of merge/rebase/fast-forward flags and optionsLibravatar Elijah Newren1-0/+182
2020-12-15pull: display default warning only when non-ffLibravatar Felipe Contreras1-5/+61
2020-11-19pull: colorize the hint about setting `pull.rebase`Libravatar Johannes Schindelin1-2/+5
2020-09-24pull: don't warn if pull.ff has been setLibravatar Alex Henrie1-1/+20
2020-03-10pull: warn if the user didn't say whether to rebase or to mergeLibravatar Alex Henrie1-0/+38
2015-05-18pull: make pull.ff=true override merge.ffLibravatar Paul Tan1-0/+8
2014-01-15pull: add pull.ff configurationLibravatar David Aguilar1-0/+21
2013-07-29many small typofixesLibravatar Ondřej Bílka1-1/+1
2013-04-12Correct common spelling mistakes in comments and testsLibravatar Stefano Lattarini1-1/+1
2010-10-06t7601 (merge-pull-config): add missing &&Libravatar Elijah Newren1-6/+6
2008-09-03tests: use "git xyzzy" form (t7200 - t9001)Libravatar Nanako Shiraishi1-1/+1
2008-07-23t7601: extend the 'merge picks up the best result' testLibravatar Miklos Vajna1-0/+15
2008-07-21builtin-merge: give a proper error message for invalid strategies in configLibravatar Miklos Vajna1-0/+12
2008-07-06Fix t7601-merge-pull-config.sh on AIXLibravatar Miklos Vajna1-7/+7
2008-06-30Add new test to ensure git-merge handles pull.twohead and pull.octopusLibravatar Miklos Vajna1-0/+129