summaryrefslogtreecommitdiff
path: root/t/t7601-merge-pull-config.sh
Commit message (Expand)AuthorAgeFilesLines
* pull: should be noop when already-up-to-dateErwin Villejo2021-11-181-0/+6
* pull: --ff-only should make it a noop when already-up-to-dateJunio C Hamano2021-10-291-1/+15
* pull: fix handling of multiple headsElijah Newren2021-07-221-1/+1
* pull: abort by default when fast-forwarding is not possibleElijah Newren2021-07-221-24/+24
* pull: make --rebase and --no-rebase override pull.ff=onlyElijah Newren2021-07-221-2/+2
* pull: abort if --ff-only is given and fast-forwarding is impossibleAlex Henrie2021-07-201-5/+5
* t7601: add tests of interactions with multiple merge heads and configElijah Newren2021-07-201-0/+22
* t7601: test interaction of merge/rebase/fast-forward flags and optionsElijah Newren2021-07-201-0/+182
* pull: display default warning only when non-ffFelipe Contreras2020-12-151-5/+61
* pull: colorize the hint about setting `pull.rebase`Johannes Schindelin2020-11-191-2/+5
* pull: don't warn if pull.ff has been setAlex Henrie2020-09-241-1/+20
* pull: warn if the user didn't say whether to rebase or to mergeAlex Henrie2020-03-101-0/+38
* 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
View Lorry Controller Status