summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'js/bisect-no-checkout'Junio C Hamano2011-08-177-178/+430
|\
| * bisect: add support for bisecting bare repositoriesJon Seymour2011-08-094-3/+40
| * bisect: further style nitpicksJunio C Hamano2011-08-051-10/+8
| * bisect: replace "; then" with "\n<tab>*then"Jon Seymour2011-08-051-9/+18
| * bisect: cleanup whitespace errors in git-bisect.sh.Jon Seymour2011-08-051-134/+134
| * bisect: add documentation for --no-checkout option.Jon Seymour2011-08-041-1/+31
| * bisect: add tests for the --no-checkout option.Jon Seymour2011-08-041-0/+82
| * bisect: introduce --no-checkout support into porcelain.Jon Seymour2011-08-041-11/+37
| * bisect: introduce support for --no-checkout option.Jon Seymour2011-08-043-14/+28
| * bisect: add tests to document expected behaviour in presence of broken trees.Jon Seymour2011-08-041-0/+48
| * bisect: use && to connect statements that are deferred with eval.Jon Seymour2011-08-041-2/+2
| * bisect: move argument parsing before state modification.Jon Seymour2011-08-042-36/+44
* | Merge branch 'rc/histogram-diff'Junio 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
* | | Merge branch 'jc/maint-smart-http-race-upload-pack'Junio C Hamano2011-08-171-9/+98
|\ \ \
| * | | helping smart-http/stateless-rpc fetch raceJunio C Hamano2011-08-081-9/+98
* | | | Merge branch 'js/sh-style'Junio C Hamano2011-08-174-12/+12
|\ \ \ \
| * | | | filter-branch.sh: de-dent usage stringJunio C Hamano2011-08-051-5/+5
| * | | | misc-sh: fix up whitespace in some other .sh files.Jon Seymour2011-08-054-12/+12
* | | | | Merge branch 'js/ref-namespaces'Junio C Hamano2011-08-1715-24/+326
|\ \ \ \ \
| * | | | | ref namespaces: testsJosh Triplett2011-07-211-0/+85
| * | | | | ref namespaces: documentationJosh Triplett2011-07-117-5/+101
| * | | | | ref namespaces: Support remote repositories via upload-pack and receive-packJosh Triplett2011-07-112-13/+47
| * | | | | ref namespaces: infrastructureJosh Triplett2011-07-066-2/+89
| * | | | | Fix prefix handling in ref iteration functionsJosh Triplett2011-07-061-4/+4
* | | | | | Merge branch 'cb/maint-quiet-push'Junio C Hamano2011-08-176-10/+39
|\ \ \ \ \ \
| * | | | | | receive-pack: do not overstep command line argument arrayJunio C Hamano2011-08-081-1/+1
| * | | | | | propagate --quiet to send-pack/receive-packClemens Buchacher2011-07-316-9/+38
* | | | | | | Merge branch 'jc/maint-combined-diff-work-tree'Junio C Hamano2011-08-171-4/+10
|\ \ \ \ \ \ \
| * | | | | | | diff -c/--cc: do not mistake "resolved as deletion" as "use working tree"Junio C Hamano2011-08-041-4/+10
* | | | | | | | Merge branch 'cb/maint-exec-error-report'Junio C Hamano2011-08-173-17/+33
|\ \ \ \ \ \ \ \
| * | | | | | | | notice error exit from pagerClemens Buchacher2011-08-011-9/+6
| * | | | | | | | error_routine: use parent's stderr if exec failsClemens Buchacher2011-07-313-8/+27
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'maint'Junio C Hamano2011-08-171-32/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | checkout-index: remove obsolete commentNguyễn Thái Ngọc Duy2011-08-171-32/+0
* | | | | | | | | 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
| |\ \ \ \ \ \ \ \