summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* grep: add --threads=<num> option and grep.threads configurationvl/grep-configurable-threadsVictor Leschuk2015-12-164-13/+44
* grep: slight refactoring to the code that disables threadingVictor Leschuk2015-12-151-2/+1
* grep: allow threading even on a single-core machineVictor Leschuk2015-12-151-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
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'js/gc-with-stale-symref' into maintJunio C Hamano2015-10-202-1/+20
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'rd/test-path-utils' into maintJunio C Hamano2015-10-202-2/+5
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/doc-gc-prune-now' into maintJunio C Hamano2015-10-201-2/+5
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/filter-branch-use-of-sed-on-incomplete-line' into maintJunio C Hamano2015-10-202-1/+15
| |\ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | Sixth batch for 2.7Junio C Hamano2015-10-201-1/+10
* | | | | | | | | | | | | | Merge branch 'tb/t0027-crlf'Junio C Hamano2015-10-201-34/+157
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | t0027: improve test for not-normalized filestb/t0027-crlfTorsten Bögershausen2015-10-121-34/+157
* | | | | | | | | | | | | | | Merge branch 'ls/p4-test-updates'Junio C Hamano2015-10-202-5/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | git-p4: skip t9819 test case on case insensitive file systemsls/p4-test-updatesLars Schneider2015-10-121-0/+6
| * | | | | | | | | | | | | | | git-p4: avoid "stat" command in t9815 git-p4-submit-failLars Schneider2015-10-121-5/+2
| | |_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'jk/war-on-sprintf'Junio C Hamano2015-10-2089-1056/+946
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | name-rev: use strip_suffix to avoid magic numbersJeff King2015-10-051-5/+4
| * | | | | | | | | | | | | | | use strbuf_complete to conditionally append slashJeff King2015-10-057-20/+10
| * | | | | | | | | | | | | | | fsck: use for_each_loose_file_in_objdirJeff King2015-10-051-46/+24
| * | | | | | | | | | | | | | | Makefile: drop D_INO_IN_DIRENT build knobJeff King2015-10-053-15/+0
| * | | | | | | | | | | | | | | fsck: drop inode-sorting codeJeff King2015-10-051-68/+2
| * | | | | | | | | | | | | | | convert strncpy to memcpyJeff King2015-10-053-4/+4
| * | | | | | | | | | | | | | | notes: document length of fanout path with a constantJeff King2015-10-051-3/+6
| * | | | | | | | | | | | | | | color: add color_set helper for copying raw colorsJeff King2015-10-053-16/+28