summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* lf_to_crlf_filter(): resurrect CRLF->CRLF hackjc/maint-lf-to-crlf-keep-crlfJunio C Hamano2011-12-181-10/+50
* lf_to_crlf_filter(): tell the caller we added "\n" when drainingcn/maint-lf-to-crlf-filterJunio C Hamano2011-12-161-5/+7
* convert: track state in LF-to-CRLF filterCarlos Martín Nieto2011-11-281-13/+37
* Git 1.7.7v1.7.7Junio C Hamano2011-09-303-10/+6
* templates/hooks--*: remove sample hooks without any functionalityGerrit Pape2011-09-272-23/+0
* contrib/hooks: adapt comment about Debian install location for contrib hooksGerrit Pape2011-09-261-2/+2
* Merge branch 'jc/namespace-doc-with-old-asciidoc'Junio C Hamano2011-09-261-0/+7
|\
| * Documentation/gitnamespaces.txt: cater to older asciidocJunio C Hamano2011-09-161-0/+7
* | Git 1.7.7-rc3v1.7.7-rc3Junio C Hamano2011-09-232-31/+2
* | Merge 1.7.6.4 inJunio C Hamano2011-09-232-1/+34
|\ \
| * | Git 1.7.6.4v1.7.6.4Junio C Hamano2011-09-234-3/+36
| * | Merge branch 'cb/maint-ls-files-error-report' into maintJunio C Hamano2011-09-236-10/+90
| |\ \
| * | | describe: Refresh the index when run with --dirtyAllan Caffee2011-09-231-2/+15
| * | | Merge branch 'jc/maint-clone-alternates' into maintJunio C Hamano2011-09-233-30/+114
| |\ \ \
| * \ \ \ Merge branch 'nd/maint-clone-gitdir' into maintJunio C Hamano2011-09-239-12/+33
| |\ \ \ \
| * \ \ \ \ Merge branch 'mh/check-ref-format-print-normalize' into maintJunio C Hamano2011-09-233-4/+13
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'mg/branch-set-upstream-previous' into maintJunio C Hamano2011-09-232-1/+15
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'gb/maint-am-patch-format-error-message' into maintJunio C Hamano2011-09-231-1/+2
| |\ \ \ \ \ \ \
* | | | | | | | | merge-recursive: Do not look at working tree during a virtual ancestor mergeJunio C Hamano2011-09-231-1/+1
* | | | | | | | | Merge branch 'maint'Junio C Hamano2011-09-192-2/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | git-mergetool: check return value from readJay Soffian2011-09-192-2/+2
* | | | | | | | | Merge branch 'ph/format-patch-no-color'Junio C Hamano2011-09-191-4/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t4014: clean up format.thread config after each testJeff King2011-09-191-4/+4
* | | | | | | | | | Git 1.7.7-rc2v1.7.7-rc2Junio C Hamano2011-09-182-2/+2
* | | | | | | | | | Merge branch 'ci/forbid-unwanted-current-branch-update'Junio C Hamano2011-09-165-12/+39
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | branch --set-upstream: regression fixJunio C Hamano2011-09-165-12/+39
* | | | | | | | | | | Disambiguate duplicate t9160* testsFrédéric Heitzmann2011-09-162-1/+1
* | | | | | | | | | | Merge branch 'ph/format-patch-no-color'Junio C Hamano2011-09-142-1/+10
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | format-patch: ignore ui.colorPang Yan Han2011-09-122-1/+10
* | | | | | | | | | | git-svn: teach git-svn to populate svn:mergeinfoBryan Jacobs2011-09-134-0/+742
* | | | | | | | | | | Git 1.7.7-rc1v1.7.7-rc1Junio C Hamano2011-09-121-1/+1
* | | | | | | | | | | Sync with 1.7.6.3Junio C Hamano2011-09-124-7/+19
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Git 1.7.6.3v1.7.6.3Junio C Hamano2011-09-123-2/+7
| * | | | | | | | | | Merge branch 'jl/maint-fetch-submodule-check-fix' into maintJunio C Hamano2011-09-122-6/+13
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | fetch: skip on-demand checking when no submodules are configuredJens Lehmann2011-09-092-6/+13
* | | | | | | | | | | | Merge branch 'jn/remote-helpers-doc'Junio C Hamano2011-09-123-31/+195
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | (short) documentation for the testgit remote helperMatthieu Moy2011-09-013-0/+45
| * | | | | | | | | | | | Documentation/git-remote-helpers: explain how import works with multiple refsMatthieu Moy2011-09-011-1/+21
| * | | | | | | | | | | | Documentation/remote-helpers: explain capabilities firstJonathan Nieder2011-08-291-30/+129
* | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2011-09-112-2/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Prepare for 1.7.6.3 maintenance releaseJunio C Hamano2011-09-112-1/+21
| * | | | | | | | | | | | Merge branch 'ms/reflog-show-is-default' into maintJunio C Hamano2011-09-111-2/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/reset-reflog-message-fix' into maintJunio C Hamano2011-09-112-37/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'vi/make-test-vector-less-specific' into maintJunio C Hamano2011-09-118-13/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/tag-contains-ab' (early part) into maintJunio C Hamano2011-09-111-1/+45
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dz/connect-error-report' into maintJunio C Hamano2011-09-111-14/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-mergetool-read-fix' into maintJunio C Hamano2011-09-111-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/maint-config-param' into maintJunio C Hamano2011-09-114-11/+47
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jn/doc-dashdash' into maintJunio C Hamano2011-09-119-13/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/maint-1.7.2-status-ignored' into maintJunio C Hamano2011-09-113-2/+128
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \