summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'maint'Junio C Hamano2010-12-091-4/+4
|\
| * Merge branch 'jn/ignore-doc' into maintJunio C Hamano2010-12-091-7/+23
| |\
| * \ Merge branch 'jn/cherry-pick-refresh-index' into maintJunio C Hamano2010-12-092-2/+26
| |\ \
| * \ \ Merge branch 'jl/add-p-reverse-message' into maintJunio C Hamano2010-12-091-2/+11
| |\ \ \
| * \ \ \ Merge branch 'np/diff-in-corrupt-repository' into maintJunio C Hamano2010-12-091-2/+6
| |\ \ \ \
| * \ \ \ \ Merge branch 'fc/apply-p2-get-header-name' into maintJunio C Hamano2010-12-092-14/+40
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'np/pack-broken-boundary' into maintJunio C Hamano2010-12-091-1/+15
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'ak/apply-non-git-epoch' into maintJunio C Hamano2010-12-095-6/+57
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'cm/diff-check-at-eol' into maintJunio C Hamano2010-12-092-1/+10
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'tc/smart-http-post-redirect' into maintJunio C Hamano2010-12-093-0/+20
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'ab/require-perl-5.8' into maintJunio C Hamano2010-12-0916-13/+27
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | contrib/hooks/post-receive-email: fix return values from prep_for_emailAlan Raison2010-12-091-4/+4
* | | | | | | | | | | | Merge branch 'nd/maint-fix-add-typo-detection' (early part)Junio C Hamano2010-12-081-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | add: do not rely on dtype being NULL behaviorNguyễn Thái Ngọc Duy2010-11-121-1/+2
* | | | | | | | | | | | | Merge branch 'jn/gitweb-time-hires-comes-with-5.8'Junio C Hamano2010-12-081-7/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | gitweb: Time::HiRes is in core for Perl 5.8Jakub Narebski2010-11-111-7/+5
* | | | | | | | | | | | | | Merge branch 'il/remote-fd-ext'Junio C Hamano2010-12-0811-0/+837
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | remote-fd/ext: finishing touches after code reviewIlari Liusvaara2010-11-195-18/+21
| * | | | | | | | | | | | | | git-remote-extIlari Liusvaara2010-10-136-0/+377
| * | | | | | | | | | | | | | git-remote-fdIlari Liusvaara2010-10-136-0/+142
| * | | | | | | | | | | | | | Add bidirectional_transfer_loop()Ilari Liusvaara2010-10-133-0/+317
* | | | | | | | | | | | | | | Merge branch 'jk/pager-per-command'Junio C Hamano2010-12-083-10/+52
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | allow command-specific pagers in pager.<cmd>Jeff King2010-11-173-10/+52
* | | | | | | | | | | | | | | | Merge branch 'jk/maint-decorate-01-bool'Junio C Hamano2010-12-082-2/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | log.decorate: accept 0/1 bool valuesJeff King2010-11-172-2/+23
* | | | | | | | | | | | | | | | Merge branch 'gc/http-with-non-ascii-username-url'Junio C Hamano2010-12-085-1/+51
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Fix username and password extraction from HTTP URLsGabriel Corona2010-11-172-2/+12
| * | | | | | | | | | | | | | | | t5550: test HTTP authentication and userinfo decodingGabriel Corona2010-11-174-0/+40
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'ks/maint-getenv-fix'Junio C Hamano2010-12-081-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | setup: make sure git_dir path is in a permanent buffer, getenv(3) caseKirill Smelkov2010-11-121-0/+1
| | |_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'gb/gitweb-remote-heads'Junio C Hamano2010-12-083-8/+268
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | git instaweb: enable remote_headsGiuseppe Bilotta2010-11-171-0/+2
| * | | | | | | | | | | | | | | | gitweb: group remote heads by remoteGiuseppe Bilotta2010-11-172-20/+152
| * | | | | | | | | | | | | | | | gitweb: provide a routine to display (sub)sectionsGiuseppe Bilotta2010-11-171-0/+38
| * | | | | | | | | | | | | | | | gitweb: refactor repository URL printingGiuseppe Bilotta2010-11-171-1/+6
| * | | | | | | | | | | | | | | | gitweb: remotes view for a single remoteGiuseppe Bilotta2010-11-171-4/+26
| * | | | | | | | | | | | | | | | gitweb: allow action specialization in page headerGiuseppe Bilotta2010-11-171-1/+9
| * | | | | | | | | | | | | | | | gitweb: nagivation menu for tags, heads and remotesGiuseppe Bilotta2010-11-171-3/+16
| * | | | | | | | | | | | | | | | gitweb: separate heads and remotes listsGiuseppe Bilotta2010-11-171-4/+27
| * | | | | | | | | | | | | | | | gitweb: git_get_heads_list accepts an optional list of refsGiuseppe Bilotta2010-11-171-4/+7
| * | | | | | | | | | | | | | | | gitweb: introduce remote_heads featureGiuseppe Bilotta2010-11-171-2/+16
| * | | | | | | | | | | | | | | | gitweb: use fullname as hash_base in heads linkGiuseppe Bilotta2010-11-171-1/+1
* | | | | | | | | | | | | | | | | Merge branch 'mg/maint-tag-rfc1991'Junio C Hamano2010-12-085-20/+88
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | tag: recognize rfc1991 signaturesMichael J Gruber2010-11-102-7/+9
| * | | | | | | | | | | | | | | | | tag: factor out sig detection for tag displayMichael J Gruber2010-11-101-2/+2
| * | | | | | | | | | | | | | | | | tag: factor out sig detection for body editsMichael J Gruber2010-11-101-10/+2
| * | | | | | | | | | | | | | | | | verify-tag: factor out signature detectionMichael J Gruber2010-11-103-8/+16
| * | | | | | | | | | | | | | | | | t/t7004-tag: test handling of rfc1991 signaturesMichael J Gruber2010-11-101-0/+66
* | | | | | | | | | | | | | | | | | Merge branch 'jh/notes-merge'Junio C Hamano2010-12-0820-162/+3794
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Provide 'git merge --abort' as a synonym to 'git reset --merge'Johan Herland2010-11-173-3/+351