summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* git-svn: convert SVN 1.5+ / svnmerge.py svn:mergeinfo props to parentsSam Vilain2009-10-262-0/+114
* git-svn: add test data for SVN 1.5+ merge, with script.Sam Vilain2009-10-263-0/+811
* git-svn: convert SVK merge tickets to extra parentsSam Vilain2009-10-262-1/+74
* git-svn: allow test setup script to support PERL env. varSam Vilain2009-10-261-2/+3
* git-svn: add test data for SVK merge, with script.Sam Vilain2009-10-262-0/+673
* git svn: fix fetch where glob is on the top-level URLEric Wong2009-10-261-2/+2
* Update draft release notes to 1.6.6Junio C Hamano2009-10-251-0/+37
* Merge branch 'sb/gitweb-link-author'Junio C Hamano2009-10-252-5/+39
|\
| * gitweb: linkify author/committer names with searchStephen Boyd2009-10-202-5/+39
* | Merge branch 'jk/maint-cvsimport-pathname'Junio C Hamano2009-10-251-3/+14
|\ \
| * | cvsimport: fix relative argument filenamesJeff King2009-10-191-3/+14
* | | Merge branch 'iv/tar-lzma-xz'Junio C Hamano2009-10-251-1/+4
|\ \ \
| * | | import-tars: Add support for tarballs compressed with lzma, xzIngmar Vanhassel2009-10-211-1/+4
* | | | Merge branch 'bg/clone-doc'Junio C Hamano2009-10-251-13/+13
|\ \ \ \
| * | | | git-clone.txt: Fix grammar and formattingBjörn Gustavsson2009-10-211-13/+13
| |/ / /
* | | | Merge branch 'jc/receive-pack-auto'Junio C Hamano2009-10-253-4/+36
|\ \ \ \
| * | | | receive-pack: run "gc --auto --quiet" and optionally "update-server-info"Junio C Hamano2009-10-212-0/+29
| * | | | gc --auto --quiet: make the notice a bit less verboaseJunio C Hamano2009-10-211-4/+7
| |/ / /
* | | | Merge branch 'jc/fsck-default-full'Junio C Hamano2009-10-253-3/+15
|\ \ \ \
| * | | | fsck: default to "git fsck --full"Junio C Hamano2009-10-203-3/+15
* | | | | Sync with 1.6.5.2Junio C Hamano2009-10-253-6/+24
|\ \ \ \ \
| * | | | | GIT 1.6.5.2v1.6.5.2Junio C Hamano2009-10-254-3/+23
| * | | | | Merge branch 'jc/maint-fix-unpack-zlib-check' into maintJunio C Hamano2009-10-251-5/+3
| |\ \ \ \ \
| | * | | | | Fix incorrect error check while reading deflated pack dataJunio C Hamano2009-10-211-5/+3
| * | | | | | Merge branch 'maint-1.6.4' into maintJunio C Hamano2009-10-252-8/+32
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'jk/maint-1.6.3-ls-files-no-ignore-cached' into maint-1.6.4Junio C Hamano2009-10-252-8/+32
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'jn/maint-1.6.3-check-ref-format-doc' into maint-1.6.4Junio C Hamano2009-10-251-3/+6
| | |\ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ Merge branch 'maint'Junio C Hamano2009-10-252-2/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | t7800-difftool: fix the effectless GIT_DIFFTOOL_PROMPT testMarkus Heidelberg2009-10-241-1/+1
| * | | | | | | | | Work around option parsing bug in the busybox tar implementationAndreas Schwab2009-10-241-1/+1
* | | | | | | | | | Merge branch 'maint'Junio C Hamano2009-10-233-2/+4
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Fix list of released versions in the toc documentJunio C Hamano2009-10-231-1/+1
| * | | | | | | | | Merge branch 'jp/maint-send-email-fold' into maintJunio C Hamano2009-10-232-22/+78
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jn/maint-1.6.3-check-ref-format-doc' into maintJunio C Hamano2009-10-231-3/+6
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge branch 'pv/maint-add-p-no-exclude' into maintJunio C Hamano2009-10-232-1/+15
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Do not fail "describe --always" in a tag-less repositoryJunio C Hamano2009-10-232-1/+3
* | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2009-10-213-35/+14
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Document `delta` attribute in "git help attributes".Nasser Grainawi2009-10-211-0/+10
| * | | | | | | | | | | Mark files in t/t5100 as UTF-8Johannes Sixt2009-10-211-0/+4
| * | | | | | | | | | | Remove a left-over file from t/t5100Johannes Sixt2009-10-211-35/+0
* | | | | | | | | | | | Merge branch 'gb/maint-gitweb-esc-param'Junio C Hamano2009-10-211-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | / | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | gitweb: fix esc_paramGiuseppe Bilotta2009-10-141-2/+1
* | | | | | | | | | | Merge branch 'maint'Junio C Hamano2009-10-201-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Documentation/git-gc.txt: change "references" to "reference"Matt Kraai2009-10-201-1/+1
* | | | | | | | | | | Merge branch 'bg/rebase-reword'Junio C Hamano2009-10-194-6/+32
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | rebase -i: fix reword when using a terminal editorStephen Boyd2009-10-191-1/+1
| * | | | | | | | | | | Teach 'rebase -i' the command "reword"Björn Gustavsson2009-10-074-6/+32
* | | | | | | | | | | | format_commit_message(): fix function signatureJunio C Hamano2009-10-192-2/+2
* | | | | | | | | | | | Merge branch 'jp/maint-send-email-fold'Junio C Hamano2009-10-182-22/+78
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | git-send-email.perl: fold multiple entry "Cc:" and multiple single line "RCPT...Joe Perches2009-10-092-22/+78