summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jn/gitweb-plackup'Junio C Hamano2010-06-1811-105/+257
|\
| * git-instaweb: Add support for running gitweb via 'plackup'Jakub Narebski2010-06-022-3/+158
| * git-instaweb: Wait for server to start before running web browserJakub Narebski2010-06-021-2/+15
| * git-instaweb: Remove pidfile after stopping web serverJakub Narebski2010-06-021-0/+1
| * git-instaweb: Configure it to work with new gitweb structurePavan Kumar Sunkara2010-05-312-52/+27
| * git-instaweb: Put httpd logs in a "$httpd_only" subdirectoryPavan Kumar Sunkara2010-05-311-5/+9
| * gitweb: Set default destination directory for installing gitweb in MakefilePavan Kumar Sunkara2010-05-311-0/+1
| * gitweb: Move static files into seperate subdirectoryPavan Kumar Sunkara2010-05-319-47/+50
* | Merge branch 'jk/url-decode'Junio C Hamano2010-06-187-106/+153
|\ \
| * | decode file:// and ssh:// URLsJeff King2010-05-242-1/+19
| * | make url-related functions reusableJeff King2010-05-245-105/+134
* | | Merge branch 'jn/remote-set-branches'Junio C Hamano2010-06-183-11/+192
|\ \ \
| * | | Add git remote set-branchesJonathan Nieder2010-05-193-11/+192
* | | | Merge branch 'rc/ls-remote-default'Junio C Hamano2010-06-182-5/+29
|\ \ \ \
| * | | | ls-remote: print URL when no repo is specifiedTay Ray Chuan2010-05-112-5/+29
* | | | | Merge branch 'hg/id-munging'Junio C Hamano2010-06-182-8/+36
|\ \ \ \ \
| * | | | | convert: Keep foreign $Id$ on checkout.Henrik Grubbström2010-04-102-3/+15
| * | | | | convert: Safer handling of $Id$ contraction.Henrik Grubbström2010-04-102-6/+22
* | | | | | Merge branch 'tc/merge-m-log'Junio C Hamano2010-06-185-41/+87
|\ \ \ \ \ \
| * | | | | | merge: --log appends shortlog to message if specifiedTay Ray Chuan2010-05-104-9/+21
| * | | | | | fmt-merge-msg: add function to append shortlog onlyTay Ray Chuan2010-05-102-4/+10
| * | | | | | fmt-merge-msg: refactor merge title formattingTay Ray Chuan2010-05-101-29/+36
| * | | | | | fmt-merge-msg: minor refactor of fmt_merge_msg()Tay Ray Chuan2010-05-101-1/+6
| * | | | | | merge: rename variableTay Ray Chuan2010-05-101-3/+3
| * | | | | | merge: update commentTay Ray Chuan2010-05-101-1/+1
| * | | | | | t7604-merge-custom-message: show that --log doesn't append to -mTay Ray Chuan2010-05-101-0/+12
| * | | | | | t7604-merge-custom-message: shift expected output creationTay Ray Chuan2010-05-101-4/+8
* | | | | | | Merge branch 'ph/clone-message-reword'Junio C Hamano2010-06-181-1/+2
|\ \ \ \ \ \ \
| * | | | | | | clone: reword messages to match the end-user perceptionPete Harlan2010-05-091-1/+2
* | | | | | | | Update draft release notes to 1.7.2Junio C Hamano2010-06-161-25/+1
* | | | | | | | Merge 'maint' updates inJunio C Hamano2010-06-162-1/+47
|\ \ \ \ \ \ \ \
| * | | | | | | | Prepare draft release notes to 1.7.1.1Junio C Hamano2010-06-162-1/+47
| * | | | | | | | Merge branch 'cw/maint-exec-defpath' into maintJunio C Hamano2010-06-165-1/+28
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'sc/http-late-auth' into maintJunio C Hamano2010-06-163-2/+24
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'by/blame-doc-m-c' into maintJunio C Hamano2010-06-161-4/+6
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'cb/maint-stash-orphaned-file' into maintJunio C Hamano2010-06-162-1/+151
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mg/advice-statushints' into maintJunio C Hamano2010-06-162-6/+60
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jn/maint-bundle' into maintJunio C Hamano2010-06-162-2/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rr/doc-submitting' into maintJunio C Hamano2010-06-161-11/+38
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jn/t7006-fixup' into maintJunio C Hamano2010-06-162-48/+117
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jn/shortlog' into maintJunio C Hamano2010-06-166-29/+144
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'np/index-pack-memsave' into maintJunio C Hamano2010-06-161-44/+45
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sp/maint-dumb-http-pack-reidx' into maintJunio C Hamano2010-06-168-60/+149
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/am-3-show-corrupted-patch' into maintJunio C Hamano2010-06-161-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sp/maint-describe-tiebreak-with-tagger-date' into maintJunio C Hamano2010-06-164-33/+97
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'np/malloc-threading' into maintJunio C Hamano2010-06-167-8/+54
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bg/send-email-smtpdomain' into maintJunio C Hamano2010-06-163-26/+30
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rc/maint-curl-helper' into maintJunio C Hamano2010-06-164-8/+38
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'hg/maint-attr-fix' into maintJunio C Hamano2010-06-162-14/+39
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mh/status-optionally-refresh' into maintJunio C Hamano2010-06-162-0/+34
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status