Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | | | | | Merge branch 'ew/keepalive' into maint | Junio C Hamano | 2011-12-28 | 1 | -0/+13 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | enable SO_KEEPALIVE for connected TCP sockets | Eric Wong | 2011-12-05 | 1 | -0/+13 | |
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge branch 'ci/stripspace-docs' into maint | Junio C Hamano | 2011-12-28 | 2 | -7/+64 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | Update documentation for stripspaceci/stripspace-docs | Conrad Irwin | 2011-12-12 | 2 | -7/+64 | |
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge branch 'jh/fast-import-notes' into maint | Junio C Hamano | 2011-12-28 | 2 | -8/+83 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | fast-import: Fix incorrect fanout level when modifying existing notes refsjh/fast-import-notes | Johan Herland | 2011-11-28 | 2 | -7/+29 | |
| * | | | | | | | | | | | | | | | t9301: Add 2nd testcase exposing bugs in fast-import's notes fanout handling | Johan Herland | 2011-11-28 | 1 | -0/+54 | |
| * | | | | | | | | | | | | | | | t9301: Fix testcase covering up a bug in fast-import's notes fanout handling | Johan Herland | 2011-11-28 | 1 | -7/+6 | |
* | | | | | | | | | | | | | | | | Merge branch 'aw/rebase-i-stop-on-failure-to-amend' into maint | Junio C Hamano | 2011-12-28 | 1 | -13/+23 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | rebase -i: interrupt rebase when "commit --amend" failed during "reword"aw/rebase-i-stop-on-failure-to-amend | Andrew Wong | 2011-11-30 | 1 | -13/+23 | |
* | | | | | | | | | | | | | | | | | Merge branch 'tj/maint-imap-send-remove-unused' into maint | Junio C Hamano | 2011-12-28 | 1 | -1/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'maint' into tj/imap-send-remove-unusedtj/maint-imap-send-remove-unused | Junio C Hamano | 2011-11-23 | 2374 | -58531/+446169 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | imap-send: Remove unused 'use_namespace' variable | Thomas Jarosch | 2011-11-23 | 1 | -1/+0 | |
* | | | | | | | | | | | | | | | | | | Merge branch 'jn/branch-move-to-self' into maint | Junio C Hamano | 2011-12-28 | 6 | -13/+47 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | Allow checkout -B <current-branch> to update the current branchjn/branch-move-to-self | Jonathan Nieder | 2011-11-28 | 5 | -12/+23 | |
| * | | | | | | | | | | | | | | | | | | branch: allow a no-op "branch -M <current-branch> HEAD" | Jonathan Nieder | 2011-11-28 | 2 | -1/+24 | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'na/strtoimax' into maint | Junio C Hamano | 2011-12-28 | 4 | -13/+46 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | Support sizes >=2G in various config options accepting 'g' sizes.na/strtoimax | Nick Alcock | 2011-11-05 | 1 | -10/+31 | |
| * | | | | | | | | | | | | | | | | | | | Compatibility: declare strtoimax() under NO_STRTOUMAX | Johannes Sixt | 2011-11-05 | 1 | -0/+2 | |
| * | | | | | | | | | | | | | | | | | | | Add strtoimax() compatibility function. | Nick Alcock | 2011-11-02 | 2 | -3/+13 | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/refresh-porcelain-output' into maint | Junio C Hamano | 2011-12-28 | 1 | -10/+32 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | refresh_index: make porcelain output more specificjk/refresh-porcelain-output | Jeff King | 2011-11-18 | 1 | -2/+21 | |
| * | | | | | | | | | | | | | | | | | | | | refresh_index: rename format variables | Jeff King | 2011-11-18 | 1 | -6/+6 | |
| * | | | | | | | | | | | | | | | | | | | | read-cache: let refresh_cache_ent pass up changed flags | Jeff King | 2011-11-18 | 1 | -3/+6 | |
* | | | | | | | | | | | | | | | | | | | | | Git 1.7.8.1v1.7.8.1 | Junio C Hamano | 2011-12-21 | 1 | -4/+25 | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jl/submodule-status-failure-report' into maint | Junio C Hamano | 2011-12-21 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | diff/status: print submodule path when looking for changes failsjl/submodule-status-failure-report | Jens Lehmann | 2011-12-08 | 1 | -2/+2 | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'tr/userdiff-c-returns-pointer' into maint | Junio C Hamano | 2011-12-21 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | userdiff: allow * between cpp funcname wordstr/userdiff-c-returns-pointer | Thomas Rast | 2011-12-06 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'bc/maint-apply-check-no-patch' into maint | Junio C Hamano | 2011-12-21 | 3 | -6/+25 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | builtin/apply.c: report error on failure to recognize inputbc/maint-apply-check-no-patch | Brandon Casey | 2011-12-05 | 2 | -5/+24 | |
| * | | | | | | | | | | | | | | | | | | | | | | | t/t4131-apply-fake-ancestor.sh: fix broken test | Brandon Casey | 2011-12-05 | 1 | -1/+1 | |
| | |_|_|_|_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'cn/maint-lf-to-crlf-filter' into maint | Junio C Hamano | 2011-12-21 | 1 | -14/+40 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | lf_to_crlf_filter(): tell the caller we added "\n" when drainingcn/maint-lf-to-crlf-filter | Junio C Hamano | 2011-12-16 | 1 | -5/+7 | |
| * | | | | | | | | | | | | | | | | | | | | | | convert: track state in LF-to-CRLF filter | Carlos Martín Nieto | 2011-11-28 | 1 | -13/+37 | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/maint-upload-archive' into maint | Junio C Hamano | 2011-12-21 | 2 | -4/+22 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/maint-1.6.2-upload-archive' into jk/maint-upload-archive | Junio C Hamano | 2011-11-21 | 2 | -4/+22 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | archive: don't let remote clients get unreachable commitsjk/maint-1.6.2-upload-archive | Jeff King | 2011-11-21 | 5 | -8/+27 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | clone: the -o option has nothing to do with <branch> | Carlos Martín Nieto | 2011-12-21 | 1 | -2/+2 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | builtin/log: remove redundant initialization | Michael Schubert | 2011-12-21 | 1 | -2/+0 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ms/commit-cc-option-helpstring' into maint | Junio C Hamano | 2011-12-21 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | builtin/commit: add missing '/' in help messagems/commit-cc-option-helpstring | Michael Schubert | 2011-12-21 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | builtin/init-db.c: eliminate -Wformat warning on Solaris | Ævar Arnfjörð Bjarmason | 2011-12-20 | 1 | -1/+1 | |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | Update draft release notes for 1.7.8.1 | Junio C Hamano | 2011-12-13 | 2 | -1/+18 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/maint-pack-object-cycle' into maint | Junio C Hamano | 2011-12-13 | 1 | -12/+43 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | pack-object: tolerate broken packs that have duplicated objectsjc/maint-pack-object-cycle | Junio C Hamano | 2011-11-16 | 1 | -12/+43 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/index-pack-reject-dups' into maint | Junio C Hamano | 2011-12-13 | 4 | -2/+11 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | receive-pack, fetch-pack: reject bogus pack that records objects twicejc/index-pack-reject-dups | Junio C Hamano | 2011-11-16 | 4 | -2/+11 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mf/curl-select-fdset' into maint | Junio C Hamano | 2011-12-13 | 2 | -27/+21 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | http: drop "local" member from request structmf/curl-select-fdset | Jeff King | 2011-11-04 | 2 | -7/+0 |