summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Make :/ accept a regex rather than a fixed patternLinus Torvalds2010-06-141-3/+9
* Merge branch 'maint'Junio C Hamano2010-06-131-4/+4
|\
| * git-mailinfo documentation: clarify -u/--encodingZhang Le2010-06-131-4/+4
* | Merge branch 'ab/cvsserver'Junio C Hamano2010-06-133-12/+135
|\ \
| * | git-cvsserver: test for pserver authentication supportÆvar Arnfjörð Bjarmason2010-05-191-1/+15
| * | git-cvsserver: document making a password without htpasswdÆvar Arnfjörð Bjarmason2010-05-191-0/+5
| * | git-cvsserver: Improved error handling for pserverÆvar Arnfjörð Bjarmason2010-05-191-5/+24
| * | git-cvsserver: indent & clean up authdb codeÆvar Arnfjörð Bjarmason2010-05-191-10/+13
| * | git-cvsserver: use a password file cvsserver pserverSam Vilain2010-05-192-19/+31
| * | git-cvsserver: authentication support for pserverÆvar Arnfjörð Bjarmason2010-05-192-12/+82
* | | Merge branch 'mg/notes-dry-run'Junio C Hamano2010-06-135-10/+72
|\ \ \
| * | | notes: dry-run and verbose options for pruneMichael J Gruber2010-05-195-10/+72
* | | | Merge branch 'mc/maint-zoneparse'Junio C Hamano2010-06-131-1/+2
|\ \ \ \
| * | | | Add "Z" as an alias for the timezone "UTC"Marcus Comstedt2010-05-181-1/+2
* | | | | Merge branch 'jk/diff-m-doc'Junio C Hamano2010-06-131-0/+7
|\ \ \ \ \
| * | | | | docs: clarify meaning of -M for git-logJeff King2010-05-181-0/+7
| |/ / / /
* | | | | Merge branch 'jn/maint-doc-ignore'Junio C Hamano2010-06-131-5/+9
|\ \ \ \ \
| * | | | | gitignore.5: Clarify matching rulesJonathan Nieder2010-05-311-5/+9
* | | | | | Merge branch 'jn/fsck-ident'Junio C Hamano2010-06-132-2/+8
|\ \ \ \ \ \
| * | | | | | fsck: fix bogus commit header checkJonathan Nieder2010-05-282-2/+8
* | | | | | | Merge branch 'bs/userdiff-php'Junio C Hamano2010-06-131-1/+3
|\ \ \ \ \ \ \
| * | | | | | | diff: Support visibility modifiers in the PHP hunk header regexpBjörn Steinbrink2010-05-271-1/+3
* | | | | | | | Merge branch 'jk/maint-sha1-file-name-fix'Junio C Hamano2010-06-131-13/+15
|\ \ \ \ \ \ \ \
| * | | | | | | | remove over-eager caching in sha1_file_nameJeff King2010-05-251-13/+15
* | | | | | | | | Merge branch 'jk/maint-pull-dry-run-noop'Junio C Hamano2010-06-131-1/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | pull: do nothing on --dry-runJeff King2010-05-251-1/+6
| |/ / / / / / / /
* | | | | | | | | Merge branch 'ab/submodule-foreach-toplevel'Junio C Hamano2010-06-133-5/+13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git-submodule foreach: Add $toplevel variableÆvar Arnfjörð Bjarmason2010-05-253-5/+13
* | | | | | | | | | Merge branch 'rs/grep-binary'Junio C Hamano2010-06-134-41/+169
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | grep: support NUL chars in search strings for -FRené Scharfe2010-05-244-15/+58
| * | | | | | | | | | grep: use REG_STARTEND for all matching if availableRené Scharfe2010-05-242-10/+24
| * | | | | | | | | | grep: continue case insensitive fixed string search after NUL charsRené Scharfe2010-05-242-3/+13
| * | | | | | | | | | grep: use memmem() for fixed string searchRené Scharfe2010-05-242-7/+13
| * | | | | | | | | | grep: --name-only over binaryRené Scharfe2010-05-242-4/+10
| * | | | | | | | | | grep: --count over binaryRené Scharfe2010-05-242-5/+10
| * | | | | | | | | | grep: grep: refactor handling of binary mode optionsRené Scharfe2010-05-241-9/+11
| * | | | | | | | | | grep: add test script for binary file handlingRené Scharfe2010-05-241-0/+42
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jn/gitweb-syntax-highlight'Junio C Hamano2010-06-133-3/+123
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | gitweb: Refactor syntax highlighting supportJakub Narebski2010-05-032-53/+92
| * | | | | | | | | | gitweb: Syntax highlighting supportJohannes Schindelin2010-05-032-1/+82
* | | | | | | | | | | Merge branch 'js/maint-windows'Junio C Hamano2010-06-132-2/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Recent MinGW has a C99 implementation of snprintf functionsJohannes Sixt2010-05-201-1/+0
| * | | | | | | | | | | mingw: use _commit to implement fsyncErik Faye-Lund2010-05-201-1/+1
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'bw/diff-metainfo-color'Junio C Hamano2010-06-131-26/+35
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | diff: fix coloring of extended diff headersBert Wesarg2010-05-191-26/+35
* | | | | | | | | | | | Merge branch 'js/try-to-free-stackable'Junio C Hamano2010-06-134-5/+16
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Do not call release_pack_memory in malloc wrappers when GIT_TRACE is usedJohannes Sixt2010-05-081-0/+6
| * | | | | | | | | | | | Have set_try_to_free_routine return the previous routineJohannes Sixt2010-05-083-5/+10
* | | | | | | | | | | | | Merge branch 'jn/make-header-dependency'Junio C Hamano2010-06-131-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Makefile: let header dependency checker override COMPUTE_HEADER_DEPENDENCIESJonathan Nieder2010-05-081-0/+1