summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* cat-file: sort and de-dup output of --batch-all-objectsjk/cat-file-batch-allJeff King2015-06-263-12/+18
* cat-file: add --batch-all-objects optionJeff King2015-06-223-2/+77
* cat-file: split batch_one_object into two stagesJeff King2015-06-221-16/+23
* cat-file: stop returning value from batch_one_objectJeff King2015-06-221-12/+6
* cat-file: add --buffer optionJeff King2015-06-222-7/+26
* cat-file: move batch_options definition to top of fileJeff King2015-06-221-6/+7
* cat-file: minor style fix in options listJeff King2015-06-221-1/+1
* Merge branch 'jk/maint-for-each-packed-object' into jk/cat-file-batch-allJunio C Hamano2015-06-222-1/+7
|\
| * for_each_packed_object: automatically open pack indexjk/maint-for-each-packed-objectJeff King2015-06-222-1/+7
* | Merge branch 'dt/cat-file-follow-symlinks'Junio C Hamano2015-06-017-19/+601
|\ \
| * | cat-file: add --follow-symlinks to --batchdt/cat-file-follow-symlinksDavid Turner2015-05-203-7/+348
| * | sha1_name: get_sha1_with_context learns to follow symlinksDavid Turner2015-05-202-12/+28
| * | tree-walk: learn get_tree_entry_follow_symlinksDavid Turner2015-05-202-0/+224
* | | Merge branch 'rs/janitorial'Junio C Hamano2015-06-017-26/+9
|\ \ \
| * | | dir: remove unused variable sbrs/janitorialRené Scharfe2015-05-201-2/+0
| * | | clean: remove unused variable bufRené Scharfe2015-05-201-2/+0
| * | | use file_exists() to check if a file exists in the worktreeRené Scharfe2015-05-205-22/+9
* | | | Merge branch 'jk/stash-options'Junio C Hamano2015-06-012-1/+20
|\ \ \ \
| * | | | stash: recognize "--help" for subcommandsjk/stash-optionsJeff King2015-05-201-0/+11
| * | | | stash: complain about unknown flagsJeff King2015-05-202-1/+9
* | | | | Merge branch 'da/mergetool-winmerge'Junio C Hamano2015-06-013-2/+39
|\ \ \ \ \
| * | | | | mergetools: add winmerge as a builtin toolDavid Aguilar2015-05-201-0/+36
| * | | | | mergetool--lib: set IFS for difftool and mergetoolDavid Aguilar2015-05-202-2/+3
* | | | | | Merge branch 'mc/commit-doc-grammofix'Junio C Hamano2015-06-011-1/+1
|\ \ \ \ \ \
| * | | | | | Documentation/git-commit: grammofixmc/commit-doc-grammofixMichael Coleman2015-05-191-1/+1
* | | | | | | Merge branch 'jh/filter-empty-contents'Junio C Hamano2015-06-012-1/+27
|\ \ \ \ \ \ \
| * | | | | | | sha1_file: pass empty buffer to index empty filejh/filter-empty-contentsJim Hill2015-05-182-1/+27
* | | | | | | | Merge branch 'ah/usage-strings'Junio C Hamano2015-06-012-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | blame, log: format usage strings similarly to those in documentationah/usage-stringsAlex Henrie2015-05-032-2/+2
* | | | | | | | | Merge branch 'jk/http-backend-deadlock'Junio C Hamano2015-06-013-29/+139
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jk/http-backend-deadlock-2.3' into jk/http-backend-deadlockjk/http-backend-deadlockJunio C Hamano2015-05-253-29/+139
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| | * | | | | | | | Merge branch 'jk/http-backend-deadlock-2.2' into jk/http-backend-deadlock-2.3jk/http-backend-deadlock-2.3Junio C Hamano2015-05-253-29/+139
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | http-backend: spool ref negotiation requests to bufferjk/http-backend-deadlock-2.2Jeff King2015-05-253-11/+105
| | | * | | | | | | | t5551: factor out tag creationJeff King2015-05-201-13/+21
| | | * | | | | | | | http-backend: fix die recursion with custom handlerJeff King2015-05-151-5/+9
| | | | |_|_|/ / / / | | | |/| | | | | |
* | | | | | | | | | Merge branch 'dt/clean-pathspec-filter-then-lstat'Junio C Hamano2015-06-011-3/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | clean: only lstat files in pathspecdt/clean-pathspec-filter-then-lstatDavid Turner2015-05-181-3/+3
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'nd/untracked-cache'Junio C Hamano2015-05-271-2/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t7063: hide stderr from setup inside prereqJeff King2015-05-271-2/+6
* | | | | | | | | | | Sync with 2.4.2Junio C Hamano2015-05-262-1/+47
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Git 2.4.2v2.4.2Junio C Hamano2015-05-264-3/+49
| * | | | | | | | | | | Merge branch 'jk/still-interesting' into maintJunio C Hamano2015-05-261-4/+19
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/hash-object' into maintJunio C Hamano2015-05-265-9/+43
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/rebase-quiet-noop' into maintJunio C Hamano2015-05-261-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sg/complete-decorate-full-not-long' into maintJunio C Hamano2015-05-261-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/filter-branch-use-of-sed-on-incomplete-line' into maintJunio C Hamano2015-05-262-1/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/daemon-no-ipv6-for-2.4.1' into maintJunio C Hamano2015-05-261-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/stash-require-clean-index' into maintJunio C Hamano2015-05-262-7/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/git-no-more-argv0-path-munging' into maintJunio C Hamano2015-05-261-1/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Fifth batch for 2.5 cycleJunio C Hamano2015-05-261-6/+28