summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* "git pull" doesn't know "--edit"lt/pull-no-editLinus Torvalds2012-02-121-2/+6
* Merge branch 'jc/merge-ff-only-stronger-than-signed-merge'Junio C Hamano2012-02-102-1/+15
|\
| * merge: do not create a signed tag merge under --ff-only optionjc/merge-ff-only-stronger-than-signed-mergeJunio C Hamano2012-02-052-1/+15
* | Merge branch 'jc/branch-desc-typoavoidance'Junio C Hamano2012-02-102-4/+52
|\ \
| * | branch --edit-description: protect against mistyped branch namejc/branch-desc-typoavoidanceJunio C Hamano2012-02-052-4/+52
* | | Merge branch 'jn/rpm-spec'Junio C Hamano2012-02-101-0/+1
|\ \ \
| * | | git.spec: Workaround localized messages not put in any RPMjn/rpm-specJakub Narebski2012-02-031-0/+1
| | |/ | |/|
* | | Merge branch 'jk/tests-write-script'Junio C Hamano2012-02-102-6/+11
|\ \ \
| * | | t0300: use write_script helperjk/tests-write-scriptJeff King2012-02-031-6/+2
| | |/ | |/|
| * | tests: add write_script helper functionJunio C Hamano2012-02-031-0/+9
| |/
* | Sync with maintJunio C Hamano2012-02-102-36/+17
|\ \
| * | Update draft release notes to 1.7.9.1Junio C Hamano2012-02-101-0/+17
| * | Merge branch 'jc/maint-request-pull-for-tag' into maintJunio C Hamano2012-02-103-8/+4
| |\ \
| * \ \ Merge branch 'tr/grep-l-with-decoration' into maintJunio C Hamano2012-02-102-2/+25
| |\ \ \
| * \ \ \ Merge branch 'jl/submodule-re-add' into maintJunio C Hamano2012-02-102-0/+9
| |\ \ \ \
| * \ \ \ \ Merge branch 'da/maint-mergetool-twoway' into maintJunio C Hamano2012-02-102-5/+35
| |\ \ \ \ \
* | | | | | | 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