summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* i18n of multi-line advice messagesjc/advise-i18nJunio C Hamano2011-12-222-12/+20
* Git 1.7.8.1v1.7.8.1Junio C Hamano2011-12-211-4/+25
* Merge branch 'jl/submodule-status-failure-report' into maintJunio C Hamano2011-12-211-2/+2
|\
| * diff/status: print submodule path when looking for changes failsjl/submodule-status-failure-reportJens Lehmann2011-12-081-2/+2
* | Merge branch 'tr/userdiff-c-returns-pointer' into maintJunio C Hamano2011-12-211-1/+1
|\ \
| * | userdiff: allow * between cpp funcname wordstr/userdiff-c-returns-pointerThomas Rast2011-12-061-1/+1
* | | Merge branch 'bc/maint-apply-check-no-patch' into maintJunio C Hamano2011-12-213-6/+25
|\ \ \
| * | | builtin/apply.c: report error on failure to recognize inputbc/maint-apply-check-no-patchBrandon Casey2011-12-052-5/+24
| * | | t/t4131-apply-fake-ancestor.sh: fix broken testBrandon Casey2011-12-051-1/+1
* | | | Merge branch 'cn/maint-lf-to-crlf-filter' into maintJunio C Hamano2011-12-211-14/+40
|\ \ \ \
| * | | | 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
* | | | | Merge branch 'jk/maint-upload-archive' into maintJunio C Hamano2011-12-212-4/+22
|\ \ \ \ \
| * \ \ \ \ Merge branch 'jk/maint-1.6.2-upload-archive' into jk/maint-upload-archiveJunio C Hamano2011-11-212-4/+22
| |\ \ \ \ \
| | * | | | | archive: don't let remote clients get unreachable commitsjk/maint-1.6.2-upload-archiveJeff King2011-11-215-8/+27
* | | | | | | clone: the -o option has nothing to do with <branch>Carlos Martín Nieto2011-12-211-2/+2
* | | | | | | builtin/log: remove redundant initializationMichael Schubert2011-12-211-2/+0
* | | | | | | Merge branch 'ms/commit-cc-option-helpstring' into maintJunio C Hamano2011-12-211-1/+1
|\ \ \ \ \ \ \
| * | | | | | | builtin/commit: add missing '/' in help messagems/commit-cc-option-helpstringMichael Schubert2011-12-211-1/+1
* | | | | | | | builtin/init-db.c: eliminate -Wformat warning on SolarisÆvar Arnfjörð Bjarmason2011-12-201-1/+1
* | | | | | | | Update draft release notes for 1.7.8.1Junio C Hamano2011-12-132-1/+18
* | | | | | | | Merge branch 'jc/maint-pack-object-cycle' into maintJunio C Hamano2011-12-131-12/+43
|\ \ \ \ \ \ \ \
| * | | | | | | | pack-object: tolerate broken packs that have duplicated objectsjc/maint-pack-object-cycleJunio C Hamano2011-11-161-12/+43
* | | | | | | | | Merge branch 'jc/index-pack-reject-dups' into maintJunio C Hamano2011-12-134-2/+11
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | receive-pack, fetch-pack: reject bogus pack that records objects twicejc/index-pack-reject-dupsJunio C Hamano2011-11-164-2/+11
* | | | | | | | | | Merge branch 'mf/curl-select-fdset' into maintJunio C Hamano2011-12-132-27/+21
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | http: drop "local" member from request structmf/curl-select-fdsetJeff King2011-11-042-7/+0
| * | | | | | | | | | http.c: Rely on select instead of tracking whether data was receivedMika Fischer2011-11-042-16/+1
| * | | | | | | | | | http.c: Use timeout suggested by curl instead of fixed 50ms timeoutMika Fischer2011-11-041-2/+18
| * | | | | | | | | | http.c: Use curl_multi_fdset to select on curl fds instead of just sleepingMika Fischer2011-11-041-3/+3
* | | | | | | | | | | Merge branch 'nd/misc-cleanups' into maintJunio C Hamano2011-12-1310-95/+112
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | unpack_object_header_buffer(): clear the size field upon errornd/misc-cleanupsJunio C Hamano2011-10-271-1/+2
| * | | | | | | | | | | tree_entry_interesting: make use of local pointer "item"Nguyễn Thái Ngọc Duy2011-10-271-2/+2
| * | | | | | | | | | | tree_entry_interesting(): give meaningful names to return valuesNguyễn Thái Ngọc Duy2011-10-276-44/+56
| * | | | | | | | | | | read_directory_recursive: reduce one indentation levelNguyễn Thái Ngọc Duy2011-10-271-25/+25
| * | | | | | | | | | | get_tree_entry(): do not call find_tree_entry() on an empty treeJunio C Hamano2011-10-271-3/+7
| * | | | | | | | | | | tree-walk.c: do not leak internal structure in tree_entry_len()Nguyễn Thái Ngọc Duy2011-10-277-20/+20
* | | | | | | | | | | | Merge branch 'maint-1.7.7' into maintJunio C Hamano2011-12-1310-48/+101
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Git 1.7.7.5v1.7.7.5Junio C Hamano2011-12-134-3/+21
| * | | | | | | | | | | | Merge branch 'ab/clang-lints' into maint-1.7.7Junio C Hamano2011-12-133-5/+2
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | cast variable in call to free() in builtin/diff.c and submodule.cab/clang-lintsÆvar Arnfjörð Bjarmason2011-11-062-2/+2
| | * | | | | | | | | | | | apply: get rid of useless x < 0 comparison on a size_t typeÆvar Arnfjörð Bjarmason2011-11-061-3/+0
| | | |_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'nd/maint-ignore-exclude' into maint-1.7.7Junio C Hamano2011-12-132-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | checkout,merge: loosen overwriting untracked file check based on info/excludend/maint-ignore-excludeNguyễn Thái Ngọc Duy2011-11-282-2/+2
| | | |_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'maint-1.7.6' into maint-1.7.7Junio C Hamano2011-12-134-40/+78
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Git 1.7.6.5v1.7.6.5Junio C Hamano2011-12-134-3/+30
| | * | | | | | | | | | | | Merge branch 'jk/maint-fetch-status-table' into maint-1.7.6Junio C Hamano2011-12-131-38/+49
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | fetch: create status table using strbufjk/maint-fetch-status-tableJeff King2011-12-091-38/+49
| | * | | | | | | | | | | | | Merge branch 'jc/maint-name-rev-all' into maint-1.7.6Junio C Hamano2011-12-131-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ml/mailmap' into maint-1.7.6Junio C Hamano2011-12-131-3/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \