Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'ad/sha1-update-chunked' into maint | Junio C Hamano | 2015-12-08 | 1 | -5/+23 |
|\ | |||||
| * | sha1: allow limiting the size of the data passed to SHA1_Update()ad/sha1-update-chunked | Atousa Pahlevan Duprat | 2015-11-05 | 1 | -0/+6 |
| * | sha1: provide another level of indirection for the SHA-1 functions | Atousa Pahlevan Duprat | 2015-11-05 | 1 | -5/+17 |
* | | Merge branch 'dk/gc-idx-wo-pack' into maint | Junio C Hamano | 2015-12-04 | 1 | -2/+5 |
|\ \ | |||||
| * | | prepare_packed_git(): refactor garbage reporting in pack directory | Junio C Hamano | 2015-08-17 | 1 | -2/+5 |
* | | | Merge branch 'dt/name-hash-dir-entry-fix' into maint | Junio C Hamano | 2015-11-03 | 1 | -1/+2 |
|\ \ \ | |||||
| * | | | name-hash: don't reuse cache_entry in dir_entrydt/name-hash-dir-entry-fix | David Turner | 2015-10-21 | 1 | -1/+2 |
| | |/ | |/| | |||||
* | | | Merge branch 'mk/submodule-gitdir-path' into maint | Junio C Hamano | 2015-11-03 | 1 | -0/+1 |
|\ \ \ | |||||
| * | | | path: implement common_dir handling in git_pathdup_submodule()mk/submodule-gitdir-path | Max Kirillov | 2015-09-14 | 1 | -0/+1 |
* | | | | Merge branch 'js/clone-dissociate' into maint | Junio C Hamano | 2015-11-03 | 1 | -0/+1 |
|\ \ \ \ | |||||
| * | | | | sha1_file.c: add a function to release all packs | Johannes Schindelin | 2015-10-07 | 1 | -0/+1 |
| * | | | | Merge branch 'jk/index-pack-reduce-recheck' into maint | Junio C Hamano | 2015-07-27 | 1 | -1/+10 |
| |\ \ \ \ | |||||
* | \ \ \ \ | Merge branch 'jk/repository-extension' into maint | Junio C Hamano | 2015-11-03 | 1 | -0/+7 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | introduce "preciousObjects" repository extensionjk/repository-extension | Jeff King | 2015-06-24 | 1 | -0/+1 |
| * | | | | | introduce "extensions" form of core.repositoryformatversion | Jeff King | 2015-06-24 | 1 | -0/+6 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'db/push-sign-if-asked' | Junio C Hamano | 2015-08-31 | 1 | -0/+1 |
|\ \ \ \ \ | |||||
| * | | | | | config.c: rename git_config_maybe_bool_text and export it as git_parse_maybe_... | Dave Borowitz | 2015-08-19 | 1 | -0/+1 |
| | |/ / / | |/| | | | |||||
| * | | | | Merge branch 'pt/xdg-config-path' into maint | Junio C Hamano | 2015-06-05 | 1 | -1/+7 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'jc/hash-object' into maint | Junio C Hamano | 2015-05-26 | 1 | -0/+1 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'jk/prune-mtime' into maint | Junio C Hamano | 2015-05-13 | 1 | -3/+6 |
| |\ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ | Merge branch 'jc/am-state-fix' | Junio C Hamano | 2015-08-31 | 1 | -2/+3 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | write_file(): drop "fatal" parameter | Junio C Hamano | 2015-08-24 | 1 | -2/+3 |
* | | | | | | | | | Merge branch 'jk/fix-alias-pager-config-key-warnings' | Junio C Hamano | 2015-08-31 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | config: silence warnings for command names with invalid keysjk/fix-alias-pager-config-key-warnings | Jeff King | 2015-08-24 | 1 | -0/+1 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'jk/git-path' | Junio C Hamano | 2015-08-19 | 1 | -5/+42 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | memoize common git-path "constant" filesjk/git-path | Jeff King | 2015-08-10 | 1 | -0/+26 |
| * | | | | | | | | | path.c: drop git_path_submodule | Jeff King | 2015-08-10 | 1 | -3/+2 |
| * | | | | | | | | | cache.h: complete set of git_path_submodule helpers | Jeff King | 2015-08-10 | 1 | -0/+5 |
| * | | | | | | | | | cache.h: clarify documentation for git_path, et al | Jeff King | 2015-08-10 | 1 | -5/+12 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'jc/finalize-temp-file' | Junio C Hamano | 2015-08-19 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | sha1_file.c: rename move_temp_to_file() to finalize_object_file()jc/finalize-temp-file | Junio C Hamano | 2015-08-10 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'jk/date-mode-format' | Junio C Hamano | 2015-08-03 | 1 | -12/+25 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | introduce "format" date-mode | Jeff King | 2015-06-29 | 1 | -0/+2 |
| * | | | | | | | | | convert "enum date_mode" into a struct | Jeff King | 2015-06-29 | 1 | -12/+23 |
| | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'mh/init-delete-refs-api' | Junio C Hamano | 2015-08-03 | 1 | -68/+0 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | refs: move the remaining ref module declarations to refs.h | Michael Haggerty | 2015-06-22 | 1 | -66/+0 |
| * | | | | | | | | | delete_ref(): move declaration to refs.h | Michael Haggerty | 2015-06-22 | 1 | -2/+0 |
* | | | | | | | | | | Merge branch 'ee/clean-remove-dirs' | Junio C Hamano | 2015-08-03 | 1 | -1/+11 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | setup: sanity check file size in read_gitfile_gently | Erik Elfström | 2015-06-15 | 1 | -0/+1 |
| * | | | | | | | | | | setup: add gentle version of read_gitfile | Erik Elfström | 2015-06-09 | 1 | -1/+10 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'mh/replace-refs' | Junio C Hamano | 2015-08-03 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Allow to control where the replace refs are looked formh/replace-refs | Mike Hommey | 2015-06-12 | 1 | -0/+2 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'jk/index-pack-reduce-recheck' | Junio C Hamano | 2015-06-24 | 1 | -1/+10 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
| * | | | | | | | | index-pack: avoid excessive re-reading of pack directoryjk/index-pack-reduce-recheck | Jeff King | 2015-06-09 | 1 | -1/+10 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'js/sleep-without-select' | Junio C Hamano | 2015-06-24 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | help.c: wrap wait-only poll() invocation in sleep_millisec() | Johannes Sixt | 2015-06-05 | 1 | -0/+1 |
* | | | | | | | | Merge branch 'dt/cat-file-follow-symlinks' | Junio C Hamano | 2015-06-01 | 1 | -7/+13 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | sha1_name: get_sha1_with_context learns to follow symlinks | David Turner | 2015-05-20 | 1 | -7/+13 |
* | | | | | | | | | Merge branch 'nd/untracked-cache' | Junio C Hamano | 2015-05-26 | 1 | -0/+6 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | untracked cache: mark index dirty if untracked cache is updated | Nguyễn Thái Ngọc Duy | 2015-03-12 | 1 | -0/+1 |