summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rp/link-curl-before-ssl'Junio C Hamano2015-10-292-6/+34
|\
| * configure.ac: detect ssl need with libcurlrp/link-curl-before-sslRemi Pommarel2015-10-211-0/+10
| * Makefile: make curl-config path configurableRemi Pommarel2015-10-212-2/+19
| * Makefile: link libcurl before zlibRemi Pommarel2015-10-211-4/+5
* | Merge branch 'dt/name-hash-dir-entry-fix'Junio C Hamano2015-10-294-60/+35
|\ \
| * | name-hash: don't reuse cache_entry in dir_entrydt/name-hash-dir-entry-fixDavid Turner2015-10-214-60/+35
* | | Merge branch 'tk/sigchain-unnecessary-post-tempfile'Junio C Hamano2015-10-294-4/+0
|\ \ \
| * | | shallow: remove unused #include "sigchain.h"tk/sigchain-unnecessary-post-tempfileTobias Klauser2015-10-221-1/+0
| * | | read-cache: remove unused #include "sigchain.h"Tobias Klauser2015-10-221-1/+0
| * | | diff: remove unused #include "sigchain.h"Tobias Klauser2015-10-221-1/+0
| * | | credential-cache--daemon: remove unused #include "sigchain.h"Tobias Klauser2015-10-221-1/+0
* | | | Merge branch 'jk/war-on-sprintf'Junio C Hamano2015-10-292-1/+2
|\ \ \ \
| * | | | compat/mingw.c: remove printf format warningJohannes Sixt2015-10-231-1/+1
| * | | | read_branches_file: plug a FILE* leakJohannes Sixt2015-10-231-0/+1
* | | | | Merge branch 'jc/em-dash-in-doc'Junio C Hamano2015-10-296-6/+6
|\ \ \ \ \
| * | | | | Documentation: AsciiDoc spells em-dash as double-dashes, not triplejc/em-dash-in-docJunio C Hamano2015-10-226-6/+6
| | |_|/ / | |/| | |
* | | | | Merge branch 'jc/everyday-markup'Junio C Hamano2015-10-291-1/+1
|\ \ \ \ \
| * | | | | Documentation/everyday: match undefline with the textjc/everyday-markupJunio C Hamano2015-10-221-1/+1
* | | | | | Merge branch 'xf/user-manual-markup'Junio C Hamano2015-10-2911-11/+11
|\ \ \ \ \ \
| * | | | | | Documentation: match undefline with the text in old release notesxf/user-manual-markupJunio C Hamano2015-10-225-5/+5
| * | | | | | Documentation: match underline with the textJunio C Hamano2015-10-225-5/+5
| * | | | | | Documentation: fix header markupXue Fuqiao2015-10-221-1/+1
* | | | | | | Seventh batch for 2.7Junio C Hamano2015-10-261-1/+36
* | | | | | | Merge branch 'dk/p4-import-ctypes'Junio C Hamano2015-10-261-0/+1
|\ \ \ \ \ \ \
| * | | | | | | git-p4: import the ctypes moduledk/p4-import-ctypesDennis Kaarsemaker2015-10-201-0/+1
* | | | | | | | Merge branch 'jk/repository-extension'Junio C Hamano2015-10-268-12/+209
|\ \ \ \ \ \ \ \
| * | | | | | | | introduce "preciousObjects" repository extensionjk/repository-extensionJeff King2015-06-248-9/+50
| * | | | | | | | introduce "extensions" form of core.repositoryformatversionJeff King2015-06-244-3/+159
* | | | | | | | | Merge branch 'dt/t7063-fix-flaky-test'Junio C Hamano2015-10-261-1/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t7063: fix flaky untracked-cache testdt/t7063-fix-flaky-testDavid Turner2015-10-191-1/+3
* | | | | | | | | | Merge branch 'kn/for-each-tag'Junio C Hamano2015-10-261-0/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | tag.c: use the correct algorithm for the '--contains' optionkn/for-each-tagKarthik Nayak2015-10-181-0/+1
* | | | | | | | | | | Merge branch 'es/worktree-add'Junio C Hamano2015-10-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | worktree: usage: denote <branch> as optional with 'add'es/worktree-addSidhant Sharma2015-10-181-1/+1
* | | | | | | | | | | | Merge branch 'tk/stripspace'Junio C Hamano2015-10-269-103/+118
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | stripspace: use parse-options for command-line parsingtk/stripspaceTobias Klauser2015-10-161-26/+31
| * | | | | | | | | | | | strbuf: make stripspace() part of strbufTobias Klauser2015-10-169-78/+88
* | | | | | | | | | | | | Merge branch 'rt/placeholder-in-usage'Junio C Hamano2015-10-262-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | am, credential-cache: add angle brackets to usage stringrt/placeholder-in-usageRalf Thielow2015-10-162-3/+3
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'jc/usage-stdin'Junio C Hamano2015-10-2625-41/+64
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | usage: do not insist that standard input must come from a filejc/usage-stdinJunio C Hamano2015-10-1625-41/+64
* | | | | | | | | | | | | | Merge branch 'mr/worktree-list'Junio C Hamano2015-10-269-88/+485
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | worktree: add 'list' commandmr/worktree-listMichael Rappazzo2015-10-083-1/+225
| * | | | | | | | | | | | | | worktree: add details to the worktree structMichael Rappazzo2015-10-082-11/+48
| * | | | | | | | | | | | | | worktree: add a function to get worktree detailsMichael Rappazzo2015-10-082-46/+130
| * | | | | | | | | | | | | | worktree: refactor find_linked_symref functionMichael Rappazzo2015-10-081-27/+69
| * | | | | | | | | | | | | | worktree: add top-level worktree.cMichael Rappazzo2015-10-026-87/+97
* | | | | | | | | | | | | | | Merge branch 'jc/am-3-fallback-regression-fix'Junio C Hamano2015-10-261-16/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | am -3: do not let failed merge from completing the error codepathjc/am-3-fallback-regression-fixJunio C Hamano2015-10-091-16/+33
| | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Sync with maintJunio C Hamano2015-10-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \