summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* MSVC: Remove unneeded header stubsvr/msvcVincent van Ravesteijn2011-10-3112-12/+0
* Compile fix for MSVC: Include <io.h>Vincent van Ravesteijn2011-10-311-0/+1
* Compile fix for MSVC: Do not include sys/resources.hVincent van Ravesteijn2011-10-311-7/+6
* Git 1.7.8-rc0v1.7.8-rc0Junio C Hamano2011-10-302-2/+2
* Merge branch 'jk/git-tricks'Junio C Hamano2011-10-305-0/+355
|\
| * completion: match ctags symbol names in grep patternsJeff King2011-10-211-0/+13
| * contrib: add git-jump scriptJeff King2011-10-212-0/+161
| * contrib: add diff highlight scriptJeff King2011-10-182-0/+181
* | Update draft release notes to 1.7.8Junio C Hamano2011-10-271-3/+1
* | Merge branch 'sn/complete-bash-wo-process-subst'Junio C Hamano2011-10-271-1/+2
|\ \
| * | completion: fix issue with process substitution not working on Git for WindowsStefan Naewe2011-10-261-1/+2
* | | Merge branch 'rj/gitweb-clean-js'Junio C Hamano2011-10-271-1/+3
|\ \ \
| * | | gitweb/Makefile: Remove static/gitweb.js in the clean targetrj/gitweb-clean-jsRamsay Jones2011-10-261-1/+3
* | | | Merge branch 'js/grep-mutex'Junio C Hamano2011-10-271-11/+26
|\ \ \ \
| * | | | builtin/grep: simplify lock_and_read_sha1_file()Junio C Hamano2011-10-261-7/+3
| * | | | builtin/grep: make lock/unlock into static inline functionsJunio C Hamano2011-10-261-5/+23
| * | | | git grep: be careful to use mutexes only when they are initializedJohannes Schindelin2011-10-261-4/+5
| | |/ / | |/| |
* | | | Merge branch 'maint'Junio C Hamano2011-10-273-5/+55
|\ \ \ \
| * \ \ \ Merge branch 'rs/maint-estimate-cache-size' into maintJunio C Hamano2011-10-272-3/+53
| |\ \ \ \
| | * | | | read-cache.c: fix index memory allocationRené Scharfe2011-10-262-3/+53
| * | | | | clone: Quote user supplied path in a single quote pairRichard Hartmann2011-10-271-2/+2
* | | | | | Merge branch 'maint'Junio C Hamano2011-10-261-2/+6
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'jn/gitweb-highlite-sanitise' into maintJunio C Hamano2011-10-261-1/+13
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jk/argv-array' into maintJunio C Hamano2011-10-2611-107/+261
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jc/run-receive-hook-cleanup' into maintJunio C Hamano2011-10-261-19/+52
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'cn/eradicate-working-copy' into maintJunio C Hamano2011-10-264-6/+6
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'maint-1.7.6' into maintJunio C Hamano2011-10-2610-93/+166
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'mh/maint-notes-merge-pathbuf-fix' into maint-1.7.6Junio C Hamano2011-10-261-1/+2
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'ps/gitweb-js-with-lineno' into maint-1.7.6Junio C Hamano2011-10-261-4/+4
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'jm/mergetool-pathspec' into maint-1.7.6Junio C Hamano2011-10-263-70/+71
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mz/remote-rename' into maint-1.7.6Junio C Hamano2011-10-262-7/+52
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rj/maint-t9159-svn-rev-notation' into maint-1.7.6Junio C Hamano2011-10-261-0/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'hl/iso8601-more-zone-formats' into maint-1.7.6Junio C Hamano2011-10-262-11/+29
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'maint-1.7.6' into maintJunio C Hamano2011-10-267-32/+46
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | Merge branch 'tr/doc-note-rewrite' into maint-1.7.6Junio C Hamano2011-10-261-1/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/sparse-doc' into maint-1.7.6Junio C Hamano2011-10-261-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mg/maint-doc-sparse-checkout' into maint-1.7.6Junio C Hamano2011-10-264-25/+31
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'maint-1.7.5' into maint-1.7.6Junio C Hamano2011-10-263-5/+12
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'maint-1.7.4' into maint-1.7.5Junio C Hamano2011-10-263-5/+12
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'maint-1.7.3' into maint-1.7.4Junio C Hamano2011-10-263-5/+12
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sn/doc-update-index-assume-unchanged' into maint-1.7.3Junio C Hamano2011-10-261-2/+5
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | make the sample pre-commit hook script reject names with newlines, tooJim Meyering2011-10-261-2/+6
* | | | | | | | | | | | | | | | | | | | | | | | Update draft release notes to 1.7.8Junio C Hamano2011-10-261-1/+17
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'tc/submodule-clone-name-detection'Junio C Hamano2011-10-261-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | submodule::module_clone(): silence die() message from module_name()Tay Ray Chuan2011-10-211-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | submodule: whitespace fixTay Ray Chuan2011-10-211-3/+3
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'lh/gitweb-site-html-head'Junio C Hamano2011-10-265-0/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | gitweb: provide a way to customize html headersLénaïc Huard2011-10-215-0/+17
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mm/mediawiki-author-fix'Junio C Hamano2011-10-261-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | git-remote-mediawiki: don't include HTTP login/password in authorMatthieu Moy2011-10-201-0/+4