summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* git-p4: add initial support for RCS keywordsld/git-p4-expanded-keywordsLuke Diamand2012-02-233-10/+501
* Update draft release notes to 1.7.10Junio C Hamano2012-02-071-1/+12
* Merge branch 'jc/maint-request-pull-for-tag'Junio C Hamano2012-02-073-8/+4
|\
| * request-pull: explicitly ask tags/$name to be pulledjc/maint-request-pull-for-tagJunio C Hamano2012-01-313-8/+4
* | Merge branch 'bl/gitweb-project-filter'Junio C Hamano2012-02-072-20/+95
|\ \
| * | gitweb: Make project search respect project_filterJakub Narebski2012-02-011-5/+13
| * | gitweb: improve usability of projects search formJakub Narebski2012-02-012-6/+28
| * | gitweb: place links to parent directories in page headerBernhard R. Link2012-02-011-1/+4
| * | gitweb: show active project_filter in project_list page headerBernhard R. Link2012-02-011-0/+14
| * | gitweb: limit links to alternate forms of project_list to active project_filterBernhard R. Link2012-02-011-2/+4
| * | gitweb: add project_filter to limit project list to a subdirectoryBernhard R. Link2012-02-011-6/+25
| * | gitweb: prepare git_get_projects_list for use outside 'forks'.Bernhard R. Link2012-02-011-1/+6
| * | gitweb: move hard coded .git suffix out of git_get_projects_listBernhard R. Link2012-02-011-4/+6
* | | Merge branch 'jx/i18n-more-marking'Junio C Hamano2012-02-072-14/+24
|\ \ \
| * | | i18n: format_tracking_info "Your branch is behind" messagejx/i18n-more-markingJiang Xin2012-02-011-11/+21
| * | | i18n: git-commit whence_s "merge/cherry-pick" messageJiang Xin2012-02-011-3/+3
| |/ /
* | | Merge branch 'jn/svn-fe'Junio C Hamano2012-02-0728-1366/+1448
|\ \ \
| * | | vcs-svn: suppress a -Wtype-limits warningjn/svn-feJonathan Nieder2012-02-021-3/+3
| * | | vcs-svn: allow import of > 4GiB filesJonathan Nieder2012-02-023-14/+26
| * | | vcs-svn: rename check_overflow arguments for clarityRamsay Jones2012-02-021-7/+7
| * | | vcs-svn/svndiff.c: squelch false "unused" warning from gccJunio C Hamano2012-01-271-1/+1
| * | | Merge branch 'svn-fe' of git://repo.or.cz/git/jrn into jn/svn-feJunio C Hamano2012-01-2728-1362/+1432
| |\ \ \
| | * | | vcs-svn: reset first_commit_done in fast_export_initDmitry Ivankov2011-06-231-0/+1
| | * | | Merge branch 'db/text-delta' into svn-feJonathan Nieder2011-06-211-12/+0
| | |\ \ \
| | | * | | vcs-svn: do not initialize report_buffer twiceDmitry Ivankov2011-06-211-12/+0
| | * | | | Merge branch 'db/text-delta' into svn-feJonathan Nieder2011-06-155-14/+280
| | |\ \ \ \ | | | |/ / /
| | | * | | vcs-svn: avoid hangs from corrupt deltasJonathan Nieder2011-06-152-9/+46
| | | * | | vcs-svn: guard against overflow when computing preimage lengthJonathan Nieder2011-06-151-1/+14
| | | * | | Merge branch 'db/delta-applier' into db/text-deltaJonathan Nieder2011-06-154-24/+37
| | | |\ \ \
| | | * | | | vcs-svn: implement text-delta handlingDavid Barr2011-05-265-11/+227
| | | * | | | Merge branch 'db/delta-applier' into db/text-deltaJonathan Nieder2011-05-2610-26/+741
| | | |\ \ \ \
| | * | \ \ \ \ Merge branch 'db/delta-applier' into svn-feJonathan Nieder2011-06-1510-25/+753
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | / / / | | | | |/ / / | | | |/| | |
| | | * | | | vcs-svn: cap number of bytes read from sliding viewJonathan Nieder2011-06-153-2/+5
| | | * | | | test-svn-fe: split off "test-svn-fe -d" into a separate functionJonathan Nieder2011-06-151-22/+32
| | | |/ / /
| | | * | | vcs-svn: let deltas use data from preimageJonathan Nieder2011-03-282-5/+58
| | | * | | vcs-svn: let deltas use data from postimageJonathan Nieder2011-03-272-2/+68
| | | * | | vcs-svn: verify that deltas consume all inline dataJonathan Nieder2011-03-272-3/+4
| | | * | | vcs-svn: implement copyfrom_data delta instructionJonathan Nieder2011-03-272-7/+139
| | | * | | vcs-svn: read instructions from deltasJonathan Nieder2011-03-272-2/+10
| | | * | | vcs-svn: read inline data from deltasJonathan Nieder2011-03-272-11/+47
| | | * | | vcs-svn: read the preimage when applying deltasJonathan Nieder2011-03-272-0/+37
| | | * | | vcs-svn: parse svndiff0 window headerJonathan Nieder2011-03-272-6/+142
| | | * | | vcs-svn: skeleton of an svn delta parserJonathan Nieder2011-03-275-8/+133
| | | * | | vcs-svn: make buffer_read_binary API more convenientJonathan Nieder2011-03-272-4/+4
| | | * | | vcs-svn: learn to maintain a sliding view of a fileJonathan Nieder2011-03-274-0/+98
| | | * | | Makefile: list one vcs-svn/xdiff object or header per lineJonathan Nieder2011-03-271-16/+44
| | * | | | Merge branch 'db/svn-fe-code-purge' into svn-feJonathan Nieder2011-05-2618-983/+61
| | |\ \ \ \
| | | * | | | vcs-svn: drop obj_poolDavid Barr2011-03-225-260/+1
| | | * | | | vcs-svn: drop treapDavid Barr2011-03-227-445/+2
| | | * | | | vcs-svn: drop string_poolDavid Barr2011-03-227-224/+4