summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ \ \ \ \
| * \ \ \ \ \ \ 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
View Lorry Controller Status