summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
*---. Merge branches 'js/lsfix', 'pb/config' and 'jn/web' into nextJunio C Hamano2006-06-197-71/+319
|\ \ \
| | | * Make CSS file gitweb/gitweb.css more readableJakub Narebski2006-06-191-50/+222
| | * | Read configuration also from $HOME/.gitconfigJohannes Schindelin2006-06-192-15/+58
| | * | Fix setting config variables with an alternative GIT_CONFIGJohannes Schindelin2006-06-193-4/+37
| * | | Initialize lock_file struct to all zero.Johannes Schindelin2006-06-192-2/+2
* | | | Merge early parts of branch 'ff/c99'Junio C Hamano2006-06-188-38/+50
|\ \ \ \
| * | | | Change types used in bitfields to be `int's.Florian Forster2006-06-181-1/+1
| * | | | Don't use empty structure initializers.Florian Forster2006-06-181-2/+1
| * | | | Cast pointers to `void *' when used in a format.Florian Forster2006-06-181-2/+2
| * | | | Don't instantiate structures with FAMs.Florian Forster2006-06-181-19/+22
| * | | | Initialize FAMs using `FLEX_ARRAY'.Florian Forster2006-06-181-1/+2
| * | | | Remove ranges from switch statements.Florian Forster2006-06-183-13/+22
* | | | | Merge early parts of branch 'ls/am'Junio C Hamano2006-06-189-127/+200
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Make git-update-ref a builtinLukas Sandström2006-06-184-5/+11
| * | | | Make git-update-index a builtinLukas Sandström2006-06-184-11/+18
| * | | | Make git-stripspace a builtinLukas Sandström2006-06-184-9/+19
| * | | | Make git-mailinfo a builtinLukas Sandström2006-06-184-46/+61
| * | | | Make git-mailsplit a builtinLukas Sandström2006-06-184-33/+48
| * | | | Make git-write-tree a builtinLukas Sandström2006-06-184-30/+50
| |/ / /
* | | | Merge branch 'jn/web' into nextJunio C Hamano2006-06-182-63/+144
|\ \ \ \ | | |_|/ | |/| |
| * | | Fix gitweb stylesheetJakub Narebski2006-06-181-0/+4
| * | | Support for the standard mime.types map in gitwebPetr Baudis2006-06-181-0/+44
| * | | gitweb: text files for 'blob_plain' action without charset by defaultJakub Narebski2006-06-181-3/+3
| * | | gitweb: safely output binary files for 'blob_plain' actionJakub Narebski2006-06-181-4/+39
| * | | Move gitweb style to gitweb.cssJakub Narebski2006-06-182-60/+58
| |/ /
* | | Merge branch 'pb/config' into nextJunio C Hamano2006-06-189-80/+175
|\ \ \ | | |/ | |/|
| * | Support for extracting configuration from different filesPetr Baudis2006-06-182-1/+23
| |/
| * Merge branch 'yl/build'Junio C Hamano2006-06-181-8/+20
| |\
| * \ Merge branch 'jc/shared'Junio C Hamano2006-06-185-7/+47
| |\ \
| * \ \ Merge branch 'eb/mail'Junio C Hamano2006-06-181-2/+5
| |\ \ \
| * | | | Fix PPC SHA1 routine for large input buffersPaul Mackerras2006-06-181-1/+1
| * | | | Make t8001-annotate and t8002-blame more portableDennis Stosberg2006-06-181-3/+1
| * | | | Remove "refs" field from "struct object"Linus Torvalds2006-06-185-74/+149
| * | | | Make release tarballs friendlier to older tar versionsRene Scharfe2006-06-181-1/+1
* | | | | Merge branch 'master' into nextJunio C Hamano2006-06-182-32/+30
|\ \ \ \ \ | |/ / / /
| * | | | git-tar-tree: no more void pointer arithmeticRene Scharfe2006-06-181-2/+5
| * | | | git-tar-tree: documentation updateRene Scharfe2006-06-181-5/+10
| * | | | git-tar-tree: Simplify write_trailer()Rene Scharfe2006-06-181-25/+15
* | | | | Merge branch 'yl/build' into nextJunio C Hamano2006-06-171-8/+20
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | auto-detect changed prefix and/or changed build flagsYakov Lerner2006-06-171-8/+20
| |/ / /
* | | | Merge branch 'eb/mail' into nextJunio C Hamano2006-06-1724-142/+180
|\ \ \ \ | | |/ / | |/| |
| * | | Fix git-format-patch -sEric W. Biederman2006-06-171-2/+5
| |/ /
| * | Some more memory leak avoidanceLinus Torvalds2006-06-173-2/+14
| * | Move "void *util" from "struct object" into "struct commit"Linus Torvalds2006-06-176-42/+48
| * | Shrink "struct object" a bitLinus Torvalds2006-06-1721-96/+113
| * | Merge early part of branch 'jc/fetchupload'Junio C Hamano2006-06-171-0/+16
| |\ \
| * \ \ Merge branch 'jc/rw-prefix'Junio C Hamano2006-06-177-13/+141
| |\ \ \
| * \ \ \ Merge branch 'pe/date'Junio C Hamano2006-06-171-1/+1
| |\ \ \ \
* | \ \ \ \ Merge branch 'js/diff'Junio C Hamano2006-06-1760-393/+3252
|\ \ \ \ \ \
| * | | | | | diff options: add --colorJohannes Schindelin2006-06-173-11/+73
| |/ / / / /