summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'gv/portable'Junio C Hamano2010-06-2165-162/+378
|\
| * test-lib: use DIFF definition from GIT-BUILD-OPTIONSJunio C Hamano2010-06-112-10/+16
| * build: propagate $DIFF to scriptsJunio C Hamano2010-06-052-1/+3
| * Makefile: Tru64 portability fixGary V. Vaughan2010-06-021-0/+7
| * Makefile: HP-UX 10.20 portability fixesGary V. Vaughan2010-06-021-0/+8
| * Makefile: HPUX11 portability fixesGary V. Vaughan2010-06-021-0/+6
| * Makefile: SunOS 5.6 portability fixGary V. Vaughan2010-05-311-0/+12
| * inline declaration does not work on AIXGary V. Vaughan2010-05-311-0/+3
| * Allow disabling "inline"Gary V. Vaughan2010-05-313-0/+14
| * Some platforms lack socklen_t typeGary V. Vaughan2010-05-314-0/+54
| * Make NO_{INET_NTOP,INET_PTON} configured independentlyGary V. Vaughan2010-05-312-7/+32
| * Makefile: some platforms do not have hstrerror anywhereGary V. Vaughan2010-05-312-3/+15
| * git-compat-util.h: some platforms with mmap() lack MAP_FAILED definitionGary V. Vaughan2010-05-311-1/+4
| * test_cmp: do not use "diff -u" on platforms that lack oneGary V. Vaughan2010-05-312-0/+6
| * fixup: do not unconditionally disable "diff -u"Junio C Hamano2010-05-313-5/+14
| * tests: use "test_cmp", not "diff", when verifying the resultGary V. Vaughan2010-05-3119-55/+59
| * Do not use "diff" found on PATH while building and installingGary V. Vaughan2010-05-315-3/+7
| * enums: omit trailing comma for portabilityGary V. Vaughan2010-05-3126-45/+45
| * Makefile: -lpthread may still be necessary when libc has only pthread stubsGary V. Vaughan2010-05-313-2/+20
| * Rewrite dynamic structure initializations to runtime assignmentGary V. Vaughan2010-05-3114-46/+68
| * Makefile: pass CPPFLAGS through to fllow customizationGary V. Vaughan2010-05-312-1/+2
* | Merge branch 'bc/portable'Junio C Hamano2010-06-2112-28/+63
|\ \
| * | Remove python 2.5'ismsBrandon Casey2010-06-136-13/+39
| * | Makefile: add PYTHON_PATH to GIT-BUILD-OPTIONSBrandon Casey2010-06-131-0/+1
| * | t/aggregate-results: accomodate systems with small max argument list lengthBrandon Casey2010-06-022-2/+4
| * | t/t7006: ignore return status of shell's unset builtinBrandon Casey2010-06-021-5/+5
| * | t/t5150: remove space from sed scriptBrandon Casey2010-06-021-2/+2
| * | git-request-pull.sh: remove -e switch to shell interpreter which breaks kshBrandon Casey2010-06-021-6/+6
| * | t/t5800: skip if python version is older than 2.5Brandon Casey2010-06-021-2/+8
* | | Merge branch 'jn/gitweb-fastcgi'Junio C Hamano2010-06-211-152/+258
|\ \ \
| * | | gitweb: Run in FastCGI mode if gitweb script has .fcgi extensionJakub Narebski2010-06-111-8/+13
| * | | gitweb: Add support for FastCGI, using CGI::FastSam Vilain2010-05-081-2/+52
| * | | gitweb: Put all per-connection code in run() subroutineJakub Narebski2010-05-081-153/+204
* | | | Merge branch 'jn/checkout-doc'Junio C Hamano2010-06-211-23/+31
|\ \ \ \
| * | | | Documentation/checkout: clarify descriptionJonathan Nieder2010-06-111-19/+21
| * | | | Documentation/checkout: clarify descriptionJonathan Nieder2010-05-311-11/+17
* | | | | Merge branch 'em/checkout-orphan'Junio C Hamano2010-06-217-60/+168
|\ \ \ \ \
| * | | | | log_ref_setup: don't return stack-allocated arrayThomas Rast2010-06-123-17/+15
| * | | | | bash completion: add --orphan to 'git checkout'Erick Mattos2010-06-031-1/+1
| * | | | | t3200: test -l with core.logAllRefUpdates optionsErick Mattos2010-06-031-0/+24
| * | | | | checkout --orphan: respect -l option alwaysErick Mattos2010-06-032-24/+85
| * | | | | refs: split log_ref_write logic into log_ref_setupErick Mattos2010-06-022-21/+39
| * | | | | Documentation: alter checkout --orphan descriptionErick Mattos2010-06-021-14/+21
* | | | | | Drop items that are 1.7.1.1 fixes from the 1.7.1 release notesJunio C Hamano2010-06-211-21/+0
* | | | | | Merge branch 'maint'Junio C Hamano2010-06-211-0/+21
|\ \ \ \ \ \
| * | | | | | Update draft release notes to 1.7.1.1Junio C Hamano2010-06-211-0/+21
| * | | | | | Merge branch 'mc/maint-zoneparse' into maintJunio C Hamano2010-06-211-1/+2
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jk/diff-m-doc' into maintJunio C Hamano2010-06-211-0/+7
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jn/maint-doc-ignore' into maintJunio C Hamano2010-06-211-5/+9
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'bs/userdiff-php' into maintJunio C Hamano2010-06-211-1/+3
| |\ \ \ \ \ \ \ \ \