Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | list-objects: drop name_path entirely | Jeff King | 2016-02-12 | 9 | -25/+19 |
* | list-objects: convert name_path to a strbuf | Jeff King | 2016-02-12 | 3 | -36/+15 |
* | show_object_with_name: simplify by using path_name() | Jeff King | 2016-02-12 | 1 | -34/+6 |
* | http-push: stop using name_path | Jeff King | 2016-02-12 | 1 | -16/+7 |
* | Sixth batch for the 2.8 cycle | Junio C Hamano | 2016-02-10 | 1 | -0/+40 |
* | Merge branch 'js/test-lib-windows-emulated-yes' | Junio C Hamano | 2016-02-10 | 1 | -2/+4 |
|\ | |||||
| * | test-lib: limit the output of the yes utilityjs/test-lib-windows-emulated-yes | Johannes Schindelin | 2016-02-02 | 1 | -2/+4 |
* | | Merge branch 'wp/sha1-name-negative-match' | Junio C Hamano | 2016-02-10 | 3 | -11/+73 |
|\ \ | |||||
| * | | object name: introduce '^{/!-<negative pattern>}' notationwp/sha1-name-negative-match | Will Palmer | 2016-02-01 | 3 | -11/+51 |
| * | | test for '!' handling in rev-parse's named commits | Will Palmer | 2016-01-11 | 1 | -1/+23 |
* | | | Merge branch 'jk/options-cleanup' | Junio C Hamano | 2016-02-10 | 7 | -102/+57 |
|\ \ \ | |||||
| * | | | apply, ls-files: simplify "-z" parsingjk/options-cleanup | Jeff King | 2016-02-01 | 2 | -24/+6 |
| * | | | checkout-index: disallow "--no-stage" option | Jeff King | 2016-02-01 | 1 | -3/+3 |
| * | | | checkout-index: handle "--no-index" option | Jeff King | 2016-02-01 | 1 | -24/+10 |
| * | | | checkout-index: handle "--no-prefix" option | Jeff King | 2016-02-01 | 1 | -12/+6 |
| * | | | checkout-index: simplify "-z" option parsing | Jeff King | 2016-02-01 | 1 | -10/+2 |
| * | | | give "nbuf" strbuf a more meaningful name | Jeff King | 2016-02-01 | 5 | -29/+30 |
* | | | | Merge branch 'aw/push-force-with-lease-reporting' | Junio C Hamano | 2016-02-10 | 2 | -12/+18 |
|\ \ \ \ | |||||
| * | | | | push: fix ref status reporting for --force-with-leaseaw/push-force-with-lease-reporting | Andrew Wheeler | 2016-02-01 | 2 | -12/+18 |
* | | | | | Merge branch 'ls/clean-smudge-override-in-config' | Junio C Hamano | 2016-02-10 | 2 | -1/+17 |
|\ \ \ \ \ | |||||
| * | | | | | convert: treat an empty string for clean/smudge filters as "cat"ls/clean-smudge-override-in-config | Lars Schneider | 2016-01-29 | 2 | -1/+17 |
| |/ / / / | |||||
* | | | | | Merge branch 'ew/connect-verbose' | Junio C Hamano | 2016-02-10 | 1 | -5/+6 |
|\ \ \ \ \ | |||||
| * | | | | | pass transport verbosity down to git_connect | Eric Wong | 2016-01-28 | 1 | -5/+6 |
| |/ / / / | |||||
* | | | | | Merge branch 'cc/untracked' | Junio C Hamano | 2016-02-10 | 12 | -56/+307 |
|\ \ \ \ \ | |||||
| * | | | | | t7063: add tests for core.untrackedCache | Christian Couder | 2016-01-27 | 1 | -4/+81 |
| * | | | | | test-dump-untracked-cache: don't modify the untracked cache | Christian Couder | 2016-01-27 | 4 | -0/+22 |
| * | | | | | config: add core.untrackedCache | Christian Couder | 2016-01-27 | 8 | -31/+133 |
| * | | | | | dir: simplify untracked cache "ident" field | Christian Couder | 2016-01-25 | 2 | -16/+24 |
| * | | | | | dir: add remove_untracked_cache() | Christian Couder | 2016-01-25 | 3 | -5/+11 |
| * | | | | | dir: add {new,add}_untracked_cache() | Christian Couder | 2016-01-25 | 3 | -10/+20 |
| * | | | | | update-index: move 'uc' var declaration | Christian Couder | 2016-01-25 | 1 | -3/+1 |
| * | | | | | update-index: add untracked cache notifications | Christian Couder | 2016-01-25 | 1 | -5/+9 |
| * | | | | | update-index: add --test-untracked-cache | Christian Couder | 2016-01-25 | 2 | -1/+16 |
| * | | | | | update-index: use enum for untracked cache options | Christian Couder | 2016-01-25 | 1 | -5/+13 |
| * | | | | | dir: free untracked cache when removing it | Christian Couder | 2015-12-29 | 1 | -0/+1 |
* | | | | | | Merge branch 'js/xmerge-marker-eol' | Junio C Hamano | 2016-02-10 | 2 | -18/+93 |
|\ \ \ \ \ \ | |||||
| * | | | | | | merge-file: ensure that conflict sections match eol stylejs/xmerge-marker-eol | Johannes Schindelin | 2016-01-27 | 2 | -15/+25 |
| * | | | | | | merge-file: let conflict markers match end-of-line style of the context | Johannes Schindelin | 2016-01-27 | 2 | -4/+69 |
* | | | | | | | Merge branch 'nd/do-not-move-worktree-manually' | Junio C Hamano | 2016-02-10 | 3 | -21/+14 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | worktree: stop supporting moving worktrees manuallynd/do-not-move-worktree-manually | Nguyễn Thái Ngọc Duy | 2016-01-22 | 2 | -17/+10 |
| * | | | | | | | worktree.c: fix indentation | Nguyễn Thái Ngọc Duy | 2016-01-19 | 1 | -4/+4 |
* | | | | | | | | Sync with 2.7.1 | Junio C Hamano | 2016-02-05 | 2 | -1/+89 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Git 2.7.1v2.7.1 | Junio C Hamano | 2016-02-05 | 4 | -3/+91 |
| * | | | | | | | | Merge branch 'lv/add-doc-working-tree' into maint | Junio C Hamano | 2016-02-05 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'ss/clone-depth-single-doc' into maint | Junio C Hamano | 2016-02-05 | 2 | -9/+9 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'sg/t6050-failing-editor-test-fix' into maint | Junio C Hamano | 2016-02-05 | 1 | -3/+7 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'ew/for-each-ref-doc' into maint | Junio C Hamano | 2016-02-05 | 1 | -2/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ss/user-manual' into maint | Junio C Hamano | 2016-02-05 | 2 | -10/+36 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/ref-cache-non-repository-optim' into maint | Junio C Hamano | 2016-02-05 | 6 | -40/+80 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/dirname-basename' into maint | Junio C Hamano | 2016-02-05 | 7 | -24/+225 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |