summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ef/msys-imap'Junio C Hamano2009-11-175-180/+81
|\
| * Windows: use BLK_SHA1 againJohannes Sixt2009-10-231-0/+2
| * MSVC: Enable OpenSSL, and translate -lcryptoMarius Storm-Olsen2009-10-233-1/+7
| * mingw: enable OpenSSLErik Faye-Lund2009-10-231-1/+1
| * mingw: wrap SSL_set_(w|r)fd to call _get_osfhandleErik Faye-Lund2009-10-191-0/+21
| * imap-send: build imap-send on WindowsErik Faye-Lund2009-10-191-1/+1
| * imap-send: fix compilation-error on WindowsErik Faye-Lund2009-10-191-0/+1
| * imap-send: use run-command API for tunnelingErik Faye-Lund2009-10-191-21/+16
| * imap-send: use separate read and write fdsErik Faye-Lund2009-10-191-14/+23
| * imap-send: remove useless uid codeJeff King2009-10-191-144/+11
* | Merge git://git.bogomips.org/git-svnJunio C Hamano2009-11-178-65/+545
|\ \
| * | Document git-svn's first-parent ruleThomas Rast2009-11-161-0/+10
| * | git svn: attempt to create empty dirs on clone+rebaseEric Wong2009-11-154-2/+139
| * | git svn: add authorsfile test case for ~/.gitconfigEric Wong2009-11-141-0/+23
| * | git svn: read global+system config for clone+initEric Wong2009-11-141-3/+2
| * | git svn: handle SVN merges from revisions past the tip of the branchToby Allsopp2009-11-144-60/+371
* | | Update draft release notes to 1.6.6Junio C Hamano2009-11-161-27/+27
* | | Sync with 1.6.5.3Junio C Hamano2009-11-163-2/+69
|\ \ \
| * | | Git 1.6.5.3v1.6.5.3Junio C Hamano2009-11-164-3/+67
| * | | Merge branch 'bs/maint-pre-commit-hook-sample' into maintJunio C Hamano2009-11-161-9/+9
| |\ \ \
| * \ \ \ Merge branch 'jk/maint-add-p-empty' into maintJunio C Hamano2009-11-162-5/+30
| |\ \ \ \
| * \ \ \ \ Merge branch 'js/maint-diff-color-words' into maintJunio C Hamano2009-11-162-8/+32
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'tz/maint-rpm' into maintJunio C Hamano2009-11-151-1/+4
| |\ \ \ \ \ \
| | * | | | | | Makefile: Ensure rpm packages can be read by older rpm versionsTodd Zullinger2009-11-141-1/+4
| * | | | | | | Merge branch 'jk/maint-format-patch-p-suppress-stat' into maintJunio C Hamano2009-11-152-2/+28
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'pb/maint-gitweb-blob-lineno' into maintJunio C Hamano2009-11-151-1/+2
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jk/maint-1.6.3-ls-files-i' into maintJunio C Hamano2009-11-153-2/+20
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'vl/maint-openssl-signature-change' into maintJunio C Hamano2009-11-151-0/+4
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/maint-push-config' into maintJunio C Hamano2009-11-151-2/+1
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sr/blame-incomplete' into maintJunio C Hamano2009-11-151-0/+6
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-blank-at-eof' into maintJunio C Hamano2009-11-158-173/+437
| |\ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'maint'Junio C Hamano2009-11-150-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Merge branch 'jc/maint-1.6.3-graft-trailing-space' into maintJunio C Hamano2009-11-151-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tr/maint-roff-quote' into maintJunio C Hamano2009-11-153-0/+28
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ja/fetch-doc' into maintJunio C Hamano2009-11-153-67/+76
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'cb/doc-fetch-pull-merge' into maintJunio C Hamano2009-11-153-45/+66
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/maint-cvsimport-pathname' into maintJunio C Hamano2009-11-151-3/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/receive-pack-auto' into maintJunio C Hamano2009-11-153-4/+36
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'gb/maint-gitweb-esc-param' into maintJunio C Hamano2009-11-151-2/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jn/gitweb-patch' into maintJunio C Hamano2009-11-151-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bs/maint-pre-commit-hook-sample'Junio C Hamano2009-11-151-9/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | pre-commit.sample: Diff against the empty tree when HEAD is invalidBjörn Steinbrink2009-11-061-9/+9
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/maint-diff-color-words'Junio C Hamano2009-11-152-8/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | diff --color-words: bit of clean-upJunio C Hamano2009-10-311-14/+12
| * | | | | | | | | | | | | | | | | | | | | diff --color-words -U0: fix the location of hunk headersJohannes Schindelin2009-10-302-1/+7
| * | | | | | | | | | | | | | | | | | | | | t4034-diff-words: add a test for word diff without contextMarkus Heidelberg2009-10-301-0/+20
| |/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/pretty-wrap'Junio C Hamano2009-11-151-0/+57
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | log --format: don't ignore %w() at the start of format stringRené Scharfe2009-11-081-1/+1
| * | | | | | | | | | | | | | | | | | | | | Implement wrap format %w() as if it is a mode switchRené Scharfe2009-10-221-0/+57
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/log-rewrap'Junio C Hamano2009-11-152-9/+53
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / /
View Lorry Controller Status