path: root/t/
AgeCommit message (Expand)Author
2020-03-10pull: warn if the user didn't say whether to rebase or to mergeAlex Henrie
2015-05-18pull: make pull.ff=true override merge.ffPaul Tan
2014-01-16pull: add pull.ff configurationDavid Aguilar
2013-07-29many small typofixesOndřej Bílka
2013-04-12Correct common spelling mistakes in comments and testsStefano Lattarini
2010-10-06t7601 (merge-pull-config): add missing &&Elijah Newren
2008-09-03tests: use "git xyzzy" form (t7200 - t9001)Nanako Shiraishi
2008-07-23t7601: extend the 'merge picks up the best result' testMiklos Vajna
2008-07-22builtin-merge: give a proper error message for invalid strategies in configMiklos Vajna
2008-07-07Fix on AIXMiklos Vajna
2008-07-01Add new test to ensure git-merge handles pull.twohead and pull.octopusMiklos Vajna