Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | grep: add --threads=<num> option and grep.threads configurationvl/grep-configurable-threads | Victor Leschuk | 2015-12-16 | 4 | -13/+44 |
* | grep: slight refactoring to the code that disables threading | Victor Leschuk | 2015-12-15 | 1 | -2/+1 |
* | grep: allow threading even on a single-core machine | Victor Leschuk | 2015-12-15 | 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 |
|\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'js/gc-with-stale-symref' into maint | Junio C Hamano | 2015-10-20 | 2 | -1/+20 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'rd/test-path-utils' into maint | Junio C Hamano | 2015-10-20 | 2 | -2/+5 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/doc-gc-prune-now' into maint | Junio C Hamano | 2015-10-20 | 1 | -2/+5 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/filter-branch-use-of-sed-on-incomplete-line' into maint | Junio C Hamano | 2015-10-20 | 2 | -1/+15 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | | | | | | | | | | | | | | Sixth batch for 2.7 | Junio C Hamano | 2015-10-20 | 1 | -1/+10 |
* | | | | | | | | | | | | | | Merge branch 'tb/t0027-crlf' | Junio C Hamano | 2015-10-20 | 1 | -34/+157 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | t0027: improve test for not-normalized filestb/t0027-crlf | Torsten Bögershausen | 2015-10-12 | 1 | -34/+157 |
* | | | | | | | | | | | | | | | Merge branch 'ls/p4-test-updates' | Junio C Hamano | 2015-10-20 | 2 | -5/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | git-p4: skip t9819 test case on case insensitive file systemsls/p4-test-updates | Lars Schneider | 2015-10-12 | 1 | -0/+6 |
| * | | | | | | | | | | | | | | | git-p4: avoid "stat" command in t9815 git-p4-submit-fail | Lars Schneider | 2015-10-12 | 1 | -5/+2 |
| | |_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Merge branch 'jk/war-on-sprintf' | Junio C Hamano | 2015-10-20 | 89 | -1056/+946 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | name-rev: use strip_suffix to avoid magic numbers | Jeff King | 2015-10-05 | 1 | -5/+4 |
| * | | | | | | | | | | | | | | | use strbuf_complete to conditionally append slash | Jeff King | 2015-10-05 | 7 | -20/+10 |
| * | | | | | | | | | | | | | | | fsck: use for_each_loose_file_in_objdir | Jeff King | 2015-10-05 | 1 | -46/+24 |
| * | | | | | | | | | | | | | | | Makefile: drop D_INO_IN_DIRENT build knob | Jeff King | 2015-10-05 | 3 | -15/+0 |
| * | | | | | | | | | | | | | | | fsck: drop inode-sorting code | Jeff King | 2015-10-05 | 1 | -68/+2 |
| * | | | | | | | | | | | | | | | convert strncpy to memcpy | Jeff King | 2015-10-05 | 3 | -4/+4 |
| * | | | | | | | | | | | | | | | notes: document length of fanout path with a constant | Jeff King | 2015-10-05 | 1 | -3/+6 |
| * | | | | | | | | | | | | | | | color: add color_set helper for copying raw colors | Jeff King | 2015-10-05 | 3 | -16/+28 |