summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* test-lib-functions.sh: fix the second argument to some helper functionsep/fix-test-lib-functions-reportElia Pinto2015-04-161-2/+2
* Move the user-facing test library to test-lib-functions.shThomas Rast2012-02-172-549/+568
* Merge branch 'jk/git-dir-lookup'Junio C Hamano2012-02-145-5/+109
|\
| * standardize and improve lookup rules for external local reposjk/git-dir-lookupJeff King2012-02-025-5/+109
* | Merge branch 'jk/grep-binary-attribute'Junio C Hamano2012-02-145-192/+308
|\ \
| * | grep: pre-load userdiff drivers when threadedjk/grep-binary-attributeJeff King2012-02-021-4/+6
| * | grep: load file data after checking binary-nessJeff King2012-02-021-3/+3
| * | grep: respect diff attributes for binary-nessJeff King2012-02-023-2/+39
| * | grep: cache userdiff_driver in grep_sourceJeff King2012-02-022-6/+20
| * | grep: drop grep_buffer's "name" parameterJeff King2012-02-023-4/+3
| * | convert git-grep to use grep_source interfaceJeff King2012-02-021-119/+23
| * | grep: refactor the concept of "grep source" into an objectJeff King2012-02-022-34/+186
| * | grep: move sha1-reading mutex into low-level codeJeff King2012-02-023-23/+29
| * | grep: make locking flag globalJeff King2012-02-023-11/+13
* | | Merge branch 'nd/pack-objects-parseopt'Junio C Hamano2012-02-143-190/+148
|\ \ \
| * | | pack-objects: convert to use parse_options()nd/pack-objects-parseoptNguyễn Thái Ngọc Duy2012-02-011-176/+139
| * | | pack-objects: remove bogus commentNguyễn Thái Ngọc Duy2012-02-012-14/+5
| * | | pack-objects: do not accept "--index-version=version,"Nguyễn Thái Ngọc Duy2012-02-012-1/+5
| |/ /
* | | Merge branch 'dp/i18n-libcharset'Junio C Hamano2012-02-143-0/+16
|\ \ \
| * | | Makefile: introduce CHARSET_LIB to link with -lcharsetdp/i18n-libcharsetДилян Палаузов2012-02-133-0/+16
| |/ /
* | | Merge branch 'mh/war-on-extra-refs'Junio C Hamano2012-02-145-75/+64
|\ \ \
| * | | refs: remove the extra_refs APImh/war-on-extra-refsMichael Haggerty2012-02-122-30/+1
| * | | clone: do not add alternate references to extra_refsMichael Haggerty2012-02-121-12/+0
| * | | everything_local(): mark alternate refs as completeMichael Haggerty2012-02-122-1/+7
| * | | fetch-pack.c: inline insert_alternate_refs()Michael Haggerty2012-02-121-6/+1
| * | | fetch-pack.c: rename some parameters from "path" to "refname"Michael Haggerty2012-02-121-5/+5
| * | | clone.c: move more code into the "if (refs)" conditionalMichael Haggerty2012-02-121-19/+20
| * | | t5700: document a failure of alternates to affect fetchMichael Haggerty2012-02-121-3/+31
* | | | Merge branch 'lt/pull-no-edit'Junio C Hamano2012-02-141-2/+6
|\ \ \ \
| * | | | "git pull" doesn't know "--edit"lt/pull-no-editLinus Torvalds2012-02-121-2/+6
* | | | | Merge branch 'bl/gitweb-project-filter'Junio C Hamano2012-02-141-1/+1
|\ \ \ \ \
| * | | | | gitweb: Harden and improve $project_filter page titlebl/gitweb-project-filterJakub Narebski2012-02-121-1/+1
* | | | | | Merge branch 'jn/ancient-meld-support'Junio C Hamano2012-02-141-1/+1
|\ \ \ \ \ \
| * | | | | | mergetools/meld: Use --help output to detect --output supportjn/ancient-meld-supportJonathan Nieder2012-02-101-1/+1
* | | | | | | Merge branch 'jk/userdiff-config-simplify'Junio C Hamano2012-02-145-37/+12
|\ \ \ \ \ \ \
| * | | | | | | drop odd return value semantics from userdiff_configjk/userdiff-config-simplifyJeff King2012-02-075-37/+12
* | | | | | | | Sync with 1.7.9.1Junio C Hamano2012-02-143-7/+13
|\ \ \ \ \ \ \ \
| * | | | | | | | Git 1.7.9.1v1.7.9.1Junio C Hamano2012-02-143-2/+14
| * | | | | | | | Merge branch 'jk/maint-tag-show-fixes' into maintJunio C Hamano2012-02-132-32/+53
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'bw/inet-pton-ntop-compat' into maintJunio C Hamano2012-02-132-12/+0
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'mp/make-cleanse-x-for-exe' into maintJunio C Hamano2012-02-131-0/+3
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jn/merge-no-edit-fix' into maintJunio C Hamano2012-02-132-3/+19
| |\ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ Sync with maintJunio C Hamano2012-02-1312-169/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Update draft release notes to 1.7.9.1Junio C Hamano2012-02-131-3/+19
| * | | | | | | | | | | | Merge branch 'js/add-e-submodule-fix' into maintJunio C Hamano2012-02-131-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/parse-date-raw' into maintJunio C Hamano2012-02-134-1/+60
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/merge-ff-only-stronger-than-signed-merge' into maintJunio C Hamano2012-02-132-1/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/branch-desc-typoavoidance' into maintJunio C Hamano2012-02-133-4/+61
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jn/rpm-spec' into maintJunio C Hamano2012-02-131-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | t: use sane_unset instead of unsetÆvar Arnfjörð Bjarmason2012-02-136-10/+10