aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'rc/histogram-diff' into HEADJunio C Hamano2011-08-17
|\
| * xdiff/xhistogram: drop need for additional variableTay Ray Chuan2011-08-08
| * xdiff/xhistogram: rely on xdl_trim_ends()Tay Ray Chuan2011-08-08
| * xdiff/xhistogram: rework handling of recursed resultsTay Ray Chuan2011-08-08
| * xdiff: do away with xdl_mmfile_next()Tay Ray Chuan2011-08-03
| * Make test number uniqueJohannes Sixt2011-08-03
| * xdiff/xprepare: use a smaller sample size for histogram diffTay Ray Chuan2011-07-12
| * xdiff/xprepare: skip classificationTay Ray Chuan2011-07-12
| * teach --histogram to diffTay Ray Chuan2011-07-12
| * t4033-diff-patience: factor out testsTay Ray Chuan2011-07-07
| * xdiff/xpatience: factor out fall-back-diff functionTay Ray Chuan2011-07-07
| * xdiff/xprepare: refactor abort cleanupsTay Ray Chuan2011-07-07
| * xdiff/xprepare: use memset()Tay Ray Chuan2011-07-07
* | xdiff/xprepare: improve O(n*m) performance in xdl_cleanup_records()Tay Ray Chuan2011-08-17
* | Sync with "maint"Junio C Hamano2011-08-16
* | Merge branch 'maint'Junio C Hamano2011-08-16
|\ \
| * | Prepare for 1.7.6.1Junio C Hamano2011-08-16
| * | Merge branch 'jk/tag-list-multiple-patterns' into maintJunio C Hamano2011-08-16
| |\ \
| * \ \ Merge branch 'jl/submodule-update-quiet' into maintJunio C Hamano2011-08-16
| |\ \ \
| * \ \ \ Merge branch 'jl/submodule-add-relurl-wo-upstream' into maintJunio C Hamano2011-08-16
| |\ \ \ \
| * \ \ \ \ Merge branch 'oa/pull-reflog' into maintJunio C Hamano2011-08-16
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'js/ls-tree-error' into maintJunio C Hamano2011-08-16
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jk/fast-export-quote-path' into maintJunio C Hamano2011-08-16
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jc/checkout-reflog-fix' into maintJunio C Hamano2011-08-16
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jc/maint-reset-unmerged-path' into maintJunio C Hamano2011-08-16
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'mz/doc-rebase-abort' into maintJunio C Hamano2011-08-16
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'bw/log-all-ref-updates-doc' into maintJunio C Hamano2011-08-16
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/maint-add-path-stat-pwd' into maintJunio C Hamano2011-08-16
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ms/help-unknown' into maintJunio C Hamano2011-08-16
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mz/doc-synopsis-verse' into maintJunio C Hamano2011-08-16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jn/mime-type-with-params' into maintJunio C Hamano2011-08-16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/submodule-sync-no-auto-vivify' into maintJunio C Hamano2011-08-16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/zlib-wrap' into maintJunio C Hamano2011-08-16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'fk/relink-upon-ldflags-update' into maintJunio C Hamano2011-08-16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bc/submodule-foreach-stdin-fix-1.7.4' into maintJunio C Hamano2011-08-16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'aw/rebase-i-p' into maintJunio C Hamano2011-08-16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/diff-index-quick-exit-early' into maintJunio C Hamano2011-08-16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/combine-diff-binary-etc' into maintJunio C Hamano2011-08-16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | am: refresh the index at start and --resolvedJeff King2011-08-16
* | | | | | | | | | | | | | | | | | | | | | | | Update draft release notes to 1.7.7Junio C Hamano2011-08-11
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'cb/partial-commit-relative-pathspec'Junio C Hamano2011-08-11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | commit: allow partial commits with relative pathsClemens Buchacher2011-08-02
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/fast-export-quote-path'Junio C Hamano2011-08-11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | fast-export: quote paths in outputJeff King2011-08-05
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rc/maint-http-wrong-free'Junio C Hamano2011-08-11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | Makefile: some changes for http-related flag documentationTay Ray Chuan2011-08-03
| * | | | | | | | | | | | | | | | | | | | | | | | | http.c: fix an invalid free()Tay Ray Chuan2011-08-03
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/grep-function-context'Junio C Hamano2011-08-11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | grep: long context optionsRené Scharfe2011-08-01
| * | | | | | | | | | | | | | | | | | | | | | | | | | grep: add option to show whole function as contextRené Scharfe2011-08-01