summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | Merge branch 'ew/keepalive' into maintJunio C Hamano2011-12-281-0/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | enable SO_KEEPALIVE for connected TCP socketsEric Wong2011-12-051-0/+13
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'ci/stripspace-docs' into maintJunio C Hamano2011-12-282-7/+64
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Update documentation for stripspaceci/stripspace-docsConrad Irwin2011-12-122-7/+64
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'jh/fast-import-notes' into maintJunio C Hamano2011-12-282-8/+83
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | fast-import: Fix incorrect fanout level when modifying existing notes refsjh/fast-import-notesJohan Herland2011-11-282-7/+29
| * | | | | | | | | | | | | | | t9301: Add 2nd testcase exposing bugs in fast-import's notes fanout handlingJohan Herland2011-11-281-0/+54
| * | | | | | | | | | | | | | | t9301: Fix testcase covering up a bug in fast-import's notes fanout handlingJohan Herland2011-11-281-7/+6
* | | | | | | | | | | | | | | | Merge branch 'aw/rebase-i-stop-on-failure-to-amend' into maintJunio C Hamano2011-12-281-13/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | rebase -i: interrupt rebase when "commit --amend" failed during "reword"aw/rebase-i-stop-on-failure-to-amendAndrew Wong2011-11-301-13/+23
* | | | | | | | | | | | | | | | | Merge branch 'tj/maint-imap-send-remove-unused' into maintJunio C Hamano2011-12-281-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'maint' into tj/imap-send-remove-unusedtj/maint-imap-send-remove-unusedJunio C Hamano2011-11-232374-58531/+446169
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | imap-send: Remove unused 'use_namespace' variableThomas Jarosch2011-11-231-1/+0
* | | | | | | | | | | | | | | | | | Merge branch 'jn/branch-move-to-self' into maintJunio C Hamano2011-12-286-13/+47
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Allow checkout -B <current-branch> to update the current branchjn/branch-move-to-selfJonathan Nieder2011-11-285-12/+23
| * | | | | | | | | | | | | | | | | | branch: allow a no-op "branch -M <current-branch> HEAD"Jonathan Nieder2011-11-282-1/+24
* | | | | | | | | | | | | | | | | | | Merge branch 'na/strtoimax' into maintJunio C Hamano2011-12-284-13/+46
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Support sizes >=2G in various config options accepting 'g' sizes.na/strtoimaxNick Alcock2011-11-051-10/+31
| * | | | | | | | | | | | | | | | | | | Compatibility: declare strtoimax() under NO_STRTOUMAXJohannes Sixt2011-11-051-0/+2
| * | | | | | | | | | | | | | | | | | | Add strtoimax() compatibility function.Nick Alcock2011-11-022-3/+13
* | | | | | | | | | | | | | | | | | | | Merge branch 'jk/refresh-porcelain-output' into maintJunio C Hamano2011-12-281-10/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | refresh_index: make porcelain output more specificjk/refresh-porcelain-outputJeff King2011-11-181-2/+21
| * | | | | | | | | | | | | | | | | | | | refresh_index: rename format variablesJeff King2011-11-181-6/+6
| * | | | | | | | | | | | | | | | | | | | read-cache: let refresh_cache_ent pass up changed flagsJeff King2011-11-181-3/+6
* | | | | | | | | | | | | | | | | | | | | 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