summaryrefslogtreecommitdiff
path: root/t/t7601-merge-pull-config.sh
Commit message (Expand)AuthorAgeFilesLines
* pull: make pull.ff=true override merge.ffPaul Tan2015-05-181-0/+8
* pull: add pull.ff configurationDavid Aguilar2014-01-151-0/+21
* many small typofixesob/typofixesOndřej Bílka2013-07-291-1/+1
* Correct common spelling mistakes in comments and testsStefano Lattarini2013-04-121-1/+1
* t7601 (merge-pull-config): add missing &&Elijah Newren2010-10-061-6/+6
* tests: use "git xyzzy" form (t7200 - t9001)Nanako Shiraishi2008-09-031-1/+1
* t7601: extend the 'merge picks up the best result' testMiklos Vajna2008-07-231-0/+15
* builtin-merge: give a proper error message for invalid strategies in configMiklos Vajna2008-07-211-0/+12
* Fix t7601-merge-pull-config.sh on AIXMiklos Vajna2008-07-061-7/+7
* Add new test to ensure git-merge handles pull.twohead and pull.octopusMiklos Vajna2008-06-301-0/+129