Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | cat-file: sort and de-dup output of --batch-all-objectsjk/cat-file-batch-all | Jeff King | 2015-06-26 | 3 | -12/+18 |
* | cat-file: add --batch-all-objects option | Jeff King | 2015-06-22 | 3 | -2/+77 |
* | cat-file: split batch_one_object into two stages | Jeff King | 2015-06-22 | 1 | -16/+23 |
* | cat-file: stop returning value from batch_one_object | Jeff King | 2015-06-22 | 1 | -12/+6 |
* | cat-file: add --buffer option | Jeff King | 2015-06-22 | 2 | -7/+26 |
* | cat-file: move batch_options definition to top of file | Jeff King | 2015-06-22 | 1 | -6/+7 |
* | cat-file: minor style fix in options list | Jeff King | 2015-06-22 | 1 | -1/+1 |
* | Merge branch 'jk/maint-for-each-packed-object' into jk/cat-file-batch-all | Junio C Hamano | 2015-06-22 | 2 | -1/+7 |
|\ | |||||
| * | for_each_packed_object: automatically open pack indexjk/maint-for-each-packed-object | Jeff King | 2015-06-22 | 2 | -1/+7 |
* | | Merge branch 'dt/cat-file-follow-symlinks' | Junio C Hamano | 2015-06-01 | 7 | -19/+601 |
|\ \ | |||||
| * | | cat-file: add --follow-symlinks to --batchdt/cat-file-follow-symlinks | David Turner | 2015-05-20 | 3 | -7/+348 |
| * | | sha1_name: get_sha1_with_context learns to follow symlinks | David Turner | 2015-05-20 | 2 | -12/+28 |
| * | | tree-walk: learn get_tree_entry_follow_symlinks | David Turner | 2015-05-20 | 2 | -0/+224 |
* | | | Merge branch 'rs/janitorial' | Junio C Hamano | 2015-06-01 | 7 | -26/+9 |
|\ \ \ | |||||
| * | | | dir: remove unused variable sbrs/janitorial | René Scharfe | 2015-05-20 | 1 | -2/+0 |
| * | | | clean: remove unused variable buf | René Scharfe | 2015-05-20 | 1 | -2/+0 |
| * | | | use file_exists() to check if a file exists in the worktree | René Scharfe | 2015-05-20 | 5 | -22/+9 |
* | | | | Merge branch 'jk/stash-options' | Junio C Hamano | 2015-06-01 | 2 | -1/+20 |
|\ \ \ \ | |||||
| * | | | | stash: recognize "--help" for subcommandsjk/stash-options | Jeff King | 2015-05-20 | 1 | -0/+11 |
| * | | | | stash: complain about unknown flags | Jeff King | 2015-05-20 | 2 | -1/+9 |
* | | | | | Merge branch 'da/mergetool-winmerge' | Junio C Hamano | 2015-06-01 | 3 | -2/+39 |
|\ \ \ \ \ | |||||
| * | | | | | mergetools: add winmerge as a builtin tool | David Aguilar | 2015-05-20 | 1 | -0/+36 |
| * | | | | | mergetool--lib: set IFS for difftool and mergetool | David Aguilar | 2015-05-20 | 2 | -2/+3 |
* | | | | | | Merge branch 'mc/commit-doc-grammofix' | Junio C Hamano | 2015-06-01 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Documentation/git-commit: grammofixmc/commit-doc-grammofix | Michael Coleman | 2015-05-19 | 1 | -1/+1 |
* | | | | | | | Merge branch 'jh/filter-empty-contents' | Junio C Hamano | 2015-06-01 | 2 | -1/+27 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | sha1_file: pass empty buffer to index empty filejh/filter-empty-contents | Jim Hill | 2015-05-18 | 2 | -1/+27 |
* | | | | | | | | Merge branch 'ah/usage-strings' | Junio C Hamano | 2015-06-01 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | blame, log: format usage strings similarly to those in documentationah/usage-strings | Alex Henrie | 2015-05-03 | 2 | -2/+2 |
* | | | | | | | | | Merge branch 'jk/http-backend-deadlock' | Junio C Hamano | 2015-06-01 | 3 | -29/+139 |
|\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'jk/http-backend-deadlock-2.3' into jk/http-backend-deadlockjk/http-backend-deadlock | Junio C Hamano | 2015-05-25 | 3 | -29/+139 |
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | | | |||||
| | * | | | | | | | | Merge branch 'jk/http-backend-deadlock-2.2' into jk/http-backend-deadlock-2.3jk/http-backend-deadlock-2.3 | Junio C Hamano | 2015-05-25 | 3 | -29/+139 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | http-backend: spool ref negotiation requests to bufferjk/http-backend-deadlock-2.2 | Jeff King | 2015-05-25 | 3 | -11/+105 |
| | | * | | | | | | | | t5551: factor out tag creation | Jeff King | 2015-05-20 | 1 | -13/+21 |
| | | * | | | | | | | | http-backend: fix die recursion with custom handler | Jeff King | 2015-05-15 | 1 | -5/+9 |
| | | | |_|_|/ / / / | | | |/| | | | | | | |||||
* | | | | | | | | | | Merge branch 'dt/clean-pathspec-filter-then-lstat' | Junio C Hamano | 2015-06-01 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | clean: only lstat files in pathspecdt/clean-pathspec-filter-then-lstat | David Turner | 2015-05-18 | 1 | -3/+3 |
| | |_|_|_|/ / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'nd/untracked-cache' | Junio C Hamano | 2015-05-27 | 1 | -2/+6 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | t7063: hide stderr from setup inside prereq | Jeff King | 2015-05-27 | 1 | -2/+6 |
* | | | | | | | | | | | Sync with 2.4.2 | Junio C Hamano | 2015-05-26 | 2 | -1/+47 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Git 2.4.2v2.4.2 | Junio C Hamano | 2015-05-26 | 4 | -3/+49 |
| * | | | | | | | | | | | Merge branch 'jk/still-interesting' into maint | Junio C Hamano | 2015-05-26 | 1 | -4/+19 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/hash-object' into maint | Junio C Hamano | 2015-05-26 | 5 | -9/+43 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/rebase-quiet-noop' into maint | Junio C Hamano | 2015-05-26 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sg/complete-decorate-full-not-long' into maint | Junio C Hamano | 2015-05-26 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/filter-branch-use-of-sed-on-incomplete-line' into maint | Junio C Hamano | 2015-05-26 | 2 | -1/+19 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/daemon-no-ipv6-for-2.4.1' into maint | Junio C Hamano | 2015-05-26 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/stash-require-clean-index' into maint | Junio C Hamano | 2015-05-26 | 2 | -7/+16 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/git-no-more-argv0-path-munging' into maint | Junio C Hamano | 2015-05-26 | 1 | -1/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | Fifth batch for 2.5 cycle | Junio C Hamano | 2015-05-26 | 1 | -6/+28 |