summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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 'maint'Junio C Hamano2010-05-254-25/+26
|\
| * Documentation/SubmittingPatches: clarify GMail section and SMTPMichael J Gruber2010-05-251-19/+21
| * show-branch: use DEFAULT_ABBREV instead of 7Tay Ray Chuan2010-05-251-1/+2
| * t7502-commit: fix spellingTay Ray Chuan2010-05-251-1/+1
| * test get_git_work_tree() return value for NULLClemens Buchacher2010-05-251-4/+2
* | Merge branch 'by/blame-doc-m-c'Junio C Hamano2010-05-211-4/+6
|\ \
| * | blame-options.txt: Add default value for `-M/-C` options.Bo Yang2010-05-071-4/+6
* | | Merge branch 'by/log-follow'Junio C Hamano2010-05-218-18/+82
|\ \ \
| * | | tests: rename duplicate t4205Jeff King2010-05-101-0/+0
| * | | Make git log --follow find copies among unmodified files.Bo Yang2010-05-073-2/+58
| * | | Make diffcore_std only can run once before a diff_flushBo Yang2010-05-072-0/+10
| * | | Add a macro DIFF_QUEUE_CLEAR.Bo Yang2010-05-075-16/+14
| |/ /
* | | Merge branch 'mg/advice-statushints'Junio C Hamano2010-05-212-6/+60
|\ \ \
| * | | wt-status: take advice.statusHints seriouslyMichael J Gruber2010-05-062-7/+16
| * | | t7508: test advice.statusHintsMichael J Gruber2010-05-061-0/+45
* | | | Merge branch 'cb/maint-stash-orphaned-file'Junio C Hamano2010-05-212-1/+151
|\ \ \ \
| * | | | stash tests: stash can lose data in a file removed from the indexCharles Bailey2010-04-201-0/+150
| * | | | stash: Don't overwrite files that have gone from the indexCharles Bailey2010-04-181-1/+1
* | | | | Merge branch 'jn/maint-bundle'Junio C Hamano2010-05-212-2/+18
|\ \ \ \ \
| * | | | | fix "bundle --stdin" segfaultJonathan Nieder2010-04-191-2/+2
| * | | | | t5704 (bundle): add tests for bundle --stdinJonathan Nieder2010-04-191-0/+16
* | | | | | Merge branch 'pb/patch-id-plus'Junio C Hamano2010-05-212-19/+116
|\ \ \ \ \ \
| * | | | | | patch-id: Add support for mbox formatPaolo Bonzini2010-04-192-6/+90
| * | | | | | patch-id: extract parsing one diff out of generate_id_listPaolo Bonzini2010-04-191-13/+26
* | | | | | | Merge branch 'rr/doc-submitting'Junio C Hamano2010-05-211-11/+38
|\ \ \ \ \ \ \
| * | | | | | | SubmittingPatches: Add new section about what to base work onRamkumar Ramachandra2010-04-181-11/+38
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'st/remote-tags-no-tags'Junio C Hamano2010-05-216-4/+98
|\ \ \ \ \ \ \
| * | | | | | | remote add: add a --[no-]tags optionSamuel Tardieu2010-04-193-2/+90
| * | | | | | | Honor "tagopt = --tags" configuration optionSamuel Tardieu2010-04-193-2/+8
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'jn/fsck-ident'Junio C Hamano2010-05-212-0/+75
|\ \ \ \ \ \ \
| * | | | | | | fsck: check ident lines in commit objectsJonathan Nieder2010-05-012-0/+75
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'jn/gitweb-caching-prep'Junio C Hamano2010-05-212-19/+53
|\ \ \ \ \ \ \
| * | | | | | | gitweb: Move generating page title to separate subroutineJakub Narebski2010-05-011-13/+19
| * | | | | | | gitweb: Add custom error handler using die_errorJakub Narebski2010-05-011-4/+23
| * | | | | | | gitweb: Use nonlocal jump instead of 'exit' in die_errorJakub Narebski2010-05-011-2/+3
| * | | | | | | gitweb: href(..., -path_info => 0|1)Jakub Narebski2010-05-011-1/+6
| * | | | | | | Export more test-related variables when running external testsJakub Narebski2010-05-011-0/+3
| |/ / / / / /
* | | | | | | Merge branch 'jn/gitweb-install'Junio C Hamano2010-05-213-12/+41
|\ \ \ \ \ \ \
| * | | | | | | gitweb: Create install target for gitweb in MakefileJakub Narebski2010-05-013-11/+35
| * | | | | | | gitweb: Improve installation instructions in gitweb/INSTALLJakub Narebski2010-05-011-7/+12
| |/ / / / / /
* | | | | | | Merge branch 'jn/gitweb-our-squelch'Junio C Hamano2010-05-211-0/+3
|\ \ \ \ \ \ \
| * | | | | | | gitweb: Silence 'Variable VAR may be unavailable' warningsJakub Narebski2010-05-011-0/+3
* | | | | | | | Merge branch 'jn/request-pull'Junio C Hamano2010-05-213-0/+230
|\ \ \ \ \ \ \ \
| * | | | | | | | tests: chmod +x t5150Jeff King2010-05-101-0/+0
| * | | | | | | | adapt request-pull tests for new pull request formatJonathan Nieder2010-05-071-5/+5
| * | | | | | | | Merge branch 'jn/maint-request-pull' into jn/request-pullJunio C Hamano2010-05-073-0/+230
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| | * | | | | | | t5150: protect backslash with backslash in shellJunio C Hamano2010-05-071-2/+2