| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'rp/link-curl-before-ssl' | Junio C Hamano | 2015-10-29 | 2 | -6/+34 |
|\ |
|
| * | configure.ac: detect ssl need with libcurlrp/link-curl-before-ssl | Remi Pommarel | 2015-10-21 | 1 | -0/+10 |
| * | Makefile: make curl-config path configurable | Remi Pommarel | 2015-10-21 | 2 | -2/+19 |
| * | Makefile: link libcurl before zlib | Remi Pommarel | 2015-10-21 | 1 | -4/+5 |
* | | Merge branch 'dt/name-hash-dir-entry-fix' | Junio C Hamano | 2015-10-29 | 4 | -60/+35 |
|\ \ |
|
| * | | name-hash: don't reuse cache_entry in dir_entrydt/name-hash-dir-entry-fix | David Turner | 2015-10-21 | 4 | -60/+35 |
* | | | Merge branch 'tk/sigchain-unnecessary-post-tempfile' | Junio C Hamano | 2015-10-29 | 4 | -4/+0 |
|\ \ \ |
|
| * | | | shallow: remove unused #include "sigchain.h"tk/sigchain-unnecessary-post-tempfile | Tobias Klauser | 2015-10-22 | 1 | -1/+0 |
| * | | | read-cache: remove unused #include "sigchain.h" | Tobias Klauser | 2015-10-22 | 1 | -1/+0 |
| * | | | diff: remove unused #include "sigchain.h" | Tobias Klauser | 2015-10-22 | 1 | -1/+0 |
| * | | | credential-cache--daemon: remove unused #include "sigchain.h" | Tobias Klauser | 2015-10-22 | 1 | -1/+0 |
* | | | | Merge branch 'jk/war-on-sprintf' | Junio C Hamano | 2015-10-29 | 2 | -1/+2 |
|\ \ \ \ |
|
| * | | | | compat/mingw.c: remove printf format warning | Johannes Sixt | 2015-10-23 | 1 | -1/+1 |
| * | | | | read_branches_file: plug a FILE* leak | Johannes Sixt | 2015-10-23 | 1 | -0/+1 |
* | | | | | Merge branch 'jc/em-dash-in-doc' | Junio C Hamano | 2015-10-29 | 6 | -6/+6 |
|\ \ \ \ \ |
|
| * | | | | | Documentation: AsciiDoc spells em-dash as double-dashes, not triplejc/em-dash-in-doc | Junio C Hamano | 2015-10-22 | 6 | -6/+6 |
| | |_|/ /
| |/| | | |
|
* | | | | | Merge branch 'jc/everyday-markup' | Junio C Hamano | 2015-10-29 | 1 | -1/+1 |
|\ \ \ \ \ |
|
| * | | | | | Documentation/everyday: match undefline with the textjc/everyday-markup | Junio C Hamano | 2015-10-22 | 1 | -1/+1 |
* | | | | | | Merge branch 'xf/user-manual-markup' | Junio C Hamano | 2015-10-29 | 11 | -11/+11 |
|\ \ \ \ \ \ |
|
| * | | | | | | Documentation: match undefline with the text in old release notesxf/user-manual-markup | Junio C Hamano | 2015-10-22 | 5 | -5/+5 |
| * | | | | | | Documentation: match underline with the text | Junio C Hamano | 2015-10-22 | 5 | -5/+5 |
| * | | | | | | Documentation: fix header markup | Xue Fuqiao | 2015-10-22 | 1 | -1/+1 |
* | | | | | | | Seventh batch for 2.7 | Junio C Hamano | 2015-10-26 | 1 | -1/+36 |
* | | | | | | | Merge branch 'dk/p4-import-ctypes' | Junio C Hamano | 2015-10-26 | 1 | -0/+1 |
|\ \ \ \ \ \ \ |
|
| * | | | | | | | git-p4: import the ctypes moduledk/p4-import-ctypes | Dennis Kaarsemaker | 2015-10-20 | 1 | -0/+1 |
* | | | | | | | | Merge branch 'jk/repository-extension' | Junio C Hamano | 2015-10-26 | 8 | -12/+209 |
|\ \ \ \ \ \ \ \ |
|
| * | | | | | | | | introduce "preciousObjects" repository extensionjk/repository-extension | Jeff King | 2015-06-24 | 8 | -9/+50 |
| * | | | | | | | | introduce "extensions" form of core.repositoryformatversion | Jeff King | 2015-06-24 | 4 | -3/+159 |
* | | | | | | | | | Merge branch 'dt/t7063-fix-flaky-test' | Junio C Hamano | 2015-10-26 | 1 | -1/+3 |
|\ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | t7063: fix flaky untracked-cache testdt/t7063-fix-flaky-test | David Turner | 2015-10-19 | 1 | -1/+3 |
* | | | | | | | | | | Merge branch 'kn/for-each-tag' | Junio C Hamano | 2015-10-26 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | tag.c: use the correct algorithm for the '--contains' optionkn/for-each-tag | Karthik Nayak | 2015-10-18 | 1 | -0/+1 |
* | | | | | | | | | | | Merge branch 'es/worktree-add' | Junio C Hamano | 2015-10-26 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | worktree: usage: denote <branch> as optional with 'add'es/worktree-add | Sidhant Sharma | 2015-10-18 | 1 | -1/+1 |
* | | | | | | | | | | | | Merge branch 'tk/stripspace' | Junio C Hamano | 2015-10-26 | 9 | -103/+118 |
|\ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | stripspace: use parse-options for command-line parsingtk/stripspace | Tobias Klauser | 2015-10-16 | 1 | -26/+31 |
| * | | | | | | | | | | | | strbuf: make stripspace() part of strbuf | Tobias Klauser | 2015-10-16 | 9 | -78/+88 |
* | | | | | | | | | | | | | Merge branch 'rt/placeholder-in-usage' | Junio C Hamano | 2015-10-26 | 2 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | am, credential-cache: add angle brackets to usage stringrt/placeholder-in-usage | Ralf Thielow | 2015-10-16 | 2 | -3/+3 |
| |/ / / / / / / / / / / / |
|
* | | | | | | | | | | | | | Merge branch 'jc/usage-stdin' | Junio C Hamano | 2015-10-26 | 25 | -41/+64 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | usage: do not insist that standard input must come from a filejc/usage-stdin | Junio C Hamano | 2015-10-16 | 25 | -41/+64 |
* | | | | | | | | | | | | | | Merge branch 'mr/worktree-list' | Junio C Hamano | 2015-10-26 | 9 | -88/+485 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | worktree: add 'list' commandmr/worktree-list | Michael Rappazzo | 2015-10-08 | 3 | -1/+225 |
| * | | | | | | | | | | | | | | worktree: add details to the worktree struct | Michael Rappazzo | 2015-10-08 | 2 | -11/+48 |
| * | | | | | | | | | | | | | | worktree: add a function to get worktree details | Michael Rappazzo | 2015-10-08 | 2 | -46/+130 |
| * | | | | | | | | | | | | | | worktree: refactor find_linked_symref function | Michael Rappazzo | 2015-10-08 | 1 | -27/+69 |
| * | | | | | | | | | | | | | | worktree: add top-level worktree.c | Michael Rappazzo | 2015-10-02 | 6 | -87/+97 |
* | | | | | | | | | | | | | | | Merge branch 'jc/am-3-fallback-regression-fix' | Junio C Hamano | 2015-10-26 | 1 | -16/+33 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | | am -3: do not let failed merge from completing the error codepathjc/am-3-fallback-regression-fix | Junio C Hamano | 2015-10-09 | 1 | -16/+33 |
| | |_|/ / / / / / / / / / / /
| |/| | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | Sync with maint | Junio C Hamano | 2015-10-20 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|