summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* packed_object_info_detail(): do not return a stringJunio C Hamano2011-05-163-5/+5
*---. Merge branches 'jc/convert', 'jc/bigfile' and 'jc/replacing' into jc/streamingJunio C Hamano2011-05-1515-144/+293
|\ \ \
| | | * read_sha1_file(): allow selective bypassing of replacement mechanismJunio C Hamano2011-05-152-5/+12
| | | * inline lookup_replace_object() callsJunio C Hamano2011-05-153-4/+14
| | | * read_sha1_file(): get rid of read_sha1_file_repl() madnessJunio C Hamano2011-05-154-17/+9
| | | * t6050: make sure we test not just commit replacementJunio C Hamano2011-05-151-2/+16
| | | * Declare lookup_replace_object() in cache.h, not in commit.hJunio C Hamano2011-05-152-2/+1
| | * | Bigfile: teach "git add" to send a large file straight to a packJunio C Hamano2011-05-132-1/+110
| | * | index_fd(): split into two helper functionsJunio C Hamano2011-05-091-11/+31
| | * | index_fd(): turn write_object and format_check arguments into one flagJunio C Hamano2011-05-096-23/+27
| * | | convert: make it harder to screw up adding a conversion attributeJunio C Hamano2011-05-091-41/+38
| * | | convert: make it safer to add conversion attributesJunio C Hamano2011-05-091-26/+22
| * | | convert: give saner names to crlf/eol variables, types and functionsJunio C Hamano2011-05-091-30/+31
| * | | convert: rename the "eol" global variable to "core_eol"Junio C Hamano2011-05-094-10/+10
| | |/ | |/|
* | | Sync release notes for 1.7.6 to exclude what are in maintenance trackJunio C Hamano2011-05-151-12/+0
* | | Merge branch 'maint'Junio C Hamano2011-05-152-9/+17
|\ \ \
| * | | Update draft release notes to 1.7.5.2Junio C Hamano2011-05-151-0/+9
| * | | Merge branch 'cn/format-patch-quiet' into maintJunio C Hamano2011-05-152-7/+14
| |\ \ \
| * \ \ \ Merge branch 'jm/mergetool-submodules' into maintJunio C Hamano2011-05-152-9/+371
| |\ \ \ \
| * \ \ \ \ Merge branch 'jk/format-patch-quote-special-in-from' into maintJunio C Hamano2011-05-152-1/+102
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'vh/git-svn-doc' into maintJunio C Hamano2011-05-151-11/+11
| |\ \ \ \ \ \
| * | | | | | | git_open_noatime(): drop unused parameterJunio C Hamano2011-05-151-8/+7
| * | | | | | | sha1_file: typofixJunio C Hamano2011-05-151-1/+1
* | | | | | | | Merge branch 'maint'Junio C Hamano2011-05-143-6/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | add, merge, diff: do not use strcasecmp to compare config variable namesJonathan Nieder2011-05-143-6/+6
* | | | | | | | Update draft release notes to 1.7.6Junio C Hamano2011-05-131-30/+16
* | | | | | | | Merge branch 'bf/commit-template-no-cleanup'Junio C Hamano2011-05-133-1/+25
|\ \ \ \ \ \ \ \
| * | | | | | | | Do not strip empty lines / trailing spaces from a commit message templateBoris Faure2011-05-113-1/+25
* | | | | | | | | Merge branch 'jc/t1506-shell-param-expansion-gotcha'Junio C Hamano2011-05-131-2/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t1507: avoid "${parameter<op>'word'}" inside double-quotesJunio C Hamano2011-05-091-2/+5
* | | | | | | | | | Merge branch 'rr/rerere-libify-clear-gc'Junio C Hamano2011-05-133-75/+88
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | rerere: libify rerere_clear() and rerere_gc()Junio C Hamano2011-05-083-75/+88
* | | | | | | | | | | Merge branch 'js/maint-send-pack-stateless-rpc-deadlock-fix'Junio C Hamano2011-05-131-0/+5
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix' into js/ma...Junio C Hamano2011-05-051-1/+2
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | send-pack: unbreak push over stateless rpcJeff King2011-05-051-1/+2
| * | | | | | | | | | | | Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix' into js/ma...Junio C Hamano2011-04-251-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | send-pack: avoid deadlock when pack-object dies earlyJohannes Sixt2011-04-251-0/+4
* | | | | | | | | | | | | Merge branch 'jh/dirstat-lines'Junio C Hamano2011-05-135-32/+1219
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Mark dirstat error messages for translationJohan Herland2011-04-292-15/+15
| * | | | | | | | | | | | | Improve error handling when parsing dirstat parametersJohan Herland2011-04-292-30/+78
| * | | | | | | | | | | | | New --dirstat=lines mode, doing dirstat analysis based on diffstatJohan Herland2011-04-295-2/+176
| * | | | | | | | | | | | | Allow specifying --dirstat cut-off percentage as a floating point numberJohan Herland2011-04-293-11/+81
| * | | | | | | | | | | | | Add config variable for specifying default --dirstat behaviorJohan Herland2011-04-294-1/+119
| * | | | | | | | | | | | | Refactor --dirstat parsing; deprecate --cumulative and --dirstat-by-fileJohan Herland2011-04-293-22/+214
| * | | | | | | | | | | | | Make --dirstat=0 output directories that contribute < 0.1% of changesJohan Herland2011-04-292-4/+4
| * | | | | | | | | | | | | Add several testcases for --dirstat and friendsJohan Herland2011-04-291-0/+585
* | | | | | | | | | | | | | Merge branch 'jc/fix-add-u-unmerged'Junio C Hamano2011-05-132-39/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fix "add -u" that sometimes fails to resolve unmerged pathsJunio C Hamano2011-04-232-39/+30
* | | | | | | | | | | | | | | Merge branch 'jn/setup-revisions-glob-and-friends-passthru'Junio C Hamano2011-05-132-65/+122
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | revisions: allow --glob and friends in parse_options-enabled commandsJonathan Nieder2011-04-212-1/+63
View Lorry Controller Status