summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rc/histogram-diff' into HEADJunio C Hamano2011-08-1714-285/+655
|\
| * xdiff/xhistogram: drop need for additional variableTay Ray Chuan2011-08-081-5/+4
| * xdiff/xhistogram: rely on xdl_trim_ends()Tay Ray Chuan2011-08-081-27/+4
| * xdiff/xhistogram: rework handling of recursed resultsTay Ray Chuan2011-08-081-6/+9
| * xdiff: do away with xdl_mmfile_next()Tay Ray Chuan2011-08-033-20/+2
| * Make test number uniqueJohannes Sixt2011-08-031-0/+0
| * xdiff/xprepare: use a smaller sample size for histogram diffTay Ray Chuan2011-07-123-10/+17
| * xdiff/xprepare: skip classificationTay Ray Chuan2011-07-121-8/+16
| * teach --histogram to diffTay Ray Chuan2011-07-128-1/+407
| * t4033-diff-patience: factor out testsTay Ray Chuan2011-07-072-159/+168
| * xdiff/xpatience: factor out fall-back-diff functionTay Ray Chuan2011-07-073-25/+35
| * xdiff/xprepare: refactor abort cleanupsTay Ray Chuan2011-07-071-59/+32
| * xdiff/xprepare: use memset()Tay Ray Chuan2011-07-071-7/+3
* | xdiff/xprepare: improve O(n*m) performance in xdl_cleanup_records()Tay Ray Chuan2011-08-171-36/+50
* | Sync with "maint"Junio C Hamano2011-08-161-49/+1
* | Merge branch 'maint'Junio C Hamano2011-08-162-0/+54
|\ \
| * | Prepare for 1.7.6.1Junio C Hamano2011-08-162-1/+53
| * | Merge branch 'jk/tag-list-multiple-patterns' into maintJunio C Hamano2011-08-163-12/+28
| |\ \
| * \ \ Merge branch 'jl/submodule-update-quiet' into maintJunio C Hamano2011-08-162-4/+11
| |\ \ \
| * \ \ \ Merge branch 'jl/submodule-add-relurl-wo-upstream' into maintJunio C Hamano2011-08-163-11/+15
| |\ \ \ \
| * \ \ \ \ Merge branch 'oa/pull-reflog' into maintJunio C Hamano2011-08-161-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'js/ls-tree-error' into maintJunio C Hamano2011-08-162-3/+25
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jk/fast-export-quote-path' into maintJunio C Hamano2011-08-162-8/+51
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jc/checkout-reflog-fix' into maintJunio C Hamano2011-08-161-2/+5
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jc/maint-reset-unmerged-path' into maintJunio C Hamano2011-08-163-2/+18
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'mz/doc-rebase-abort' into maintJunio C Hamano2011-08-162-7/+11
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'bw/log-all-ref-updates-doc' into maintJunio C Hamano2011-08-162-3/+6
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/maint-add-path-stat-pwd' into maintJunio C Hamano2011-08-161-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ms/help-unknown' into maintJunio C Hamano2011-08-161-0/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mz/doc-synopsis-verse' into maintJunio C Hamano2011-08-1693-6/+92
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jn/mime-type-with-params' into maintJunio C Hamano2011-08-161-1/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/submodule-sync-no-auto-vivify' into maintJunio C Hamano2011-08-163-30/+47
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/zlib-wrap' into maintJunio C Hamano2011-08-1615-124/+321
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'fk/relink-upon-ldflags-update' into maintJunio C Hamano2011-08-162-8/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bc/submodule-foreach-stdin-fix-1.7.4' into maintJunio C Hamano2011-08-162-1/+23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'aw/rebase-i-p' into maintJunio C Hamano2011-08-164-5/+30
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/diff-index-quick-exit-early' into maintJunio C Hamano2011-08-163-2/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/combine-diff-binary-etc' into maintJunio C Hamano2011-08-165-83/+376
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | am: refresh the index at start and --resolvedJeff King2011-08-161-0/+2
* | | | | | | | | | | | | | | | | | | | | | | | Update draft release notes to 1.7.7Junio C Hamano2011-08-111-3/+36
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'cb/partial-commit-relative-pathspec'Junio C Hamano2011-08-114-38/+39
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | commit: allow partial commits with relative pathsClemens Buchacher2011-08-024-38/+39
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/fast-export-quote-path'Junio C Hamano2011-08-112-8/+51
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | fast-export: quote paths in outputJeff King2011-08-052-8/+51
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rc/maint-http-wrong-free'Junio C Hamano2011-08-112-9/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | Makefile: some changes for http-related flag documentationTay Ray Chuan2011-08-031-3/+3
| * | | | | | | | | | | | | | | | | | | | | | | | | http.c: fix an invalid free()Tay Ray Chuan2011-08-031-6/+2
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/grep-function-context'Junio C Hamano2011-08-115-23/+67
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | grep: long context optionsRené Scharfe2011-08-012-13/+21
| * | | | | | | | | | | | | | | | | | | | | | | | | | grep: add option to show whole function as contextRené Scharfe2011-08-015-11/+47
View Lorry Controller Status