summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/asciidoc-update'Junio C Hamano2010-12-126-29/+27
|\
| * docs: default to more modern toolsetJeff King2010-11-246-29/+27
* | Merge branch 'mz/pull-rebase-rebased'Junio C Hamano2010-12-122-2/+15
|\ \
| * | Use reflog in 'pull --rebase . foo'Martin von Zweigbergk2010-11-292-2/+15
* | | Merge branch 'mz/maint-rebase-stat-config'Junio C Hamano2010-12-121-1/+2
|\ \ \
| * | | rebase: only show stat if configured to trueMartin von Zweigbergk2010-11-291-1/+2
* | | | Merge branch 'jn/git-cmd-h-bypass-setup'Junio C Hamano2010-12-1214-0/+193
|\ \ \ \
| * | | | update-index -h: show usage even with corrupt indexNguyễn Thái Ngọc Duy2010-10-222-0/+35
| * | | | merge -h: show usage even with corrupt indexNguyễn Thái Ngọc Duy2010-10-222-0/+13
| * | | | ls-files -h: show usage even with corrupt indexNguyễn Thái Ngọc Duy2010-10-222-0/+42
| * | | | gc -h: show usage even with broken configurationNguyễn Thái Ngọc Duy2010-10-222-0/+31
| * | | | commit/status -h: show usage even with broken configurationNguyễn Thái Ngọc Duy2010-10-222-0/+30
| * | | | checkout-index -h: show usage even in an invalid repositoryNguyễn Thái Ngọc Duy2010-10-222-0/+27
| * | | | branch -h: show usage even in an invalid repositoryNguyễn Thái Ngọc Duy2010-10-222-0/+14
* | | | | Relnotes: remove items fixed on 'maint'Junio C Hamano2010-12-101-13/+0
* | | | | Merge branch 'maint'Junio C Hamano2010-12-102-0/+35
|\ \ \ \ \
| * | | | | Prepare for 1.7.3.4Junio C Hamano2010-12-102-1/+33
| * | | | | Merge branch 'jk/maint-decorate-01-bool' into maintJunio C Hamano2010-12-102-2/+23
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'mg/maint-tag-rfc1991' into maintJunio C Hamano2010-12-105-20/+88
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'ks/maint-getenv-fix' into maintJunio C Hamano2010-12-101-0/+1
| |\ \ \ \ \ \ \
| * | | | | | | | Add --force to git-send-email documentationAlejandro R. Sedeño2010-12-101-0/+3
* | | | | | | | | thread-utils.h: simplify the inclusionJunio C Hamano2010-12-104-12/+4
* | | | | | | | | Makefile: transport-helper uses thread-utils.hJonathan Nieder2010-12-101-2/+1
* | | | | | | | | Merge git://git.bogomips.org/git-svnJunio C Hamano2010-12-093-4/+56
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t9143: do not fail when unhandled.log.gz is not createdTorsten Bögershausen2010-12-101-3/+1
| * | | | | | | | | git-svn: allow the mergeinfo property to be setSteven Walter2010-12-102-1/+55
* | | | | | | | | | Documentation/git.txt: update list of maintenance releasesJunio C Hamano2010-12-091-4/+8
* | | | | | | | | | 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
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | |