summaryrefslogtreecommitdiff
path: root/t/t5515-fetch-merge-logic.sh
Commit message (Expand)AuthorAgeFilesLines
* t5515: use `main` as the name of the main branch for testing (conclusion)Johannes Schindelin2020-11-021-6/+1
* t5515: use `main` as the name of the main branch for testing (part 1)Johannes Schindelin2020-11-021-12/+20
* tests: avoid variations of the `master` branch nameJohannes Schindelin2020-09-261-3/+3
* Merge branch 'bc/hash-independent-tests-part-8'Junio C Hamano2020-02-171-5/+54
|\
| * t5515: make test hash independentbrian m. carlson2020-02-071-5/+54
* | test: request GIT_TEST_PROTOCOL_VERSION=0 when appropriateJonathan Nieder2020-01-151-1/+2
|/
* t: use LF variable defined in the test harnessJunio C Hamano2019-09-051-3/+0
* tests: fix protocol version for overspecificationsJonathan Tan2019-03-071-0/+4
* t/t5515-fetch-merge-logic.sh: use the $( ... ) construct for command substitu...Elia Pinto2015-12-281-2/+2
* test-lib: Simplify test counting.Johannes Sixt2009-03-191-2/+1
* tests: use $TEST_DIRECTORY to refer to the t/ directoryJunio C Hamano2008-08-171-2/+2
* Prepare testsuite for a "git clone" that packs refsJohan Herland2008-06-191-3/+6
* tests: do not use implicit "git diff --no-index"Junio C Hamano2008-05-241-2/+2
* git-fetch test: test tracking fetch results, not just FETCH_HEADJunio C Hamano2008-03-261-7/+19
* Don't attempt to merge non-existant remotes in t5515Shawn O. Pearce2007-09-191-2/+1
* Merge branch 'js/diff-ni'Junio C Hamano2007-03-101-1/+1
* t/t5515-fetch-merge-logic.sh: Add two more testsSanti B,Ai(Bjar2007-03-071-0/+1
* t/t5515-fetch-merge-logic.sh: Added tests for the merge login in git-fetchSanti BĂ©jar2007-03-051-0/+161