Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'ls/git-open-cloexec' | Junio C Hamano | 2016-10-31 | 1 | -1/+1 |
|\ | |||||
| * | sha1_file: rename git_open_noatime() to git_open() | Lars Schneider | 2016-10-25 | 1 | -1/+1 |
* | | Merge branch 'jk/no-looking-at-dotgit-outside-repo' | Junio C Hamano | 2016-10-27 | 1 | -2/+2 |
|\ \ | |||||
| * | | find_unique_abbrev: use 4-buffer ring | Jeff King | 2016-10-26 | 1 | -2/+2 |
* | | | Merge branch 'jk/abbrev-auto' | Junio C Hamano | 2016-10-27 | 1 | -1/+6 |
|\ \ \ | |||||
| * | | | find_unique_abbrev: move logic out of get_short_sha1()jk/abbrev-auto | Jeff King | 2016-10-03 | 1 | -1/+6 |
* | | | | Merge branch 'lt/abbrev-auto' | Junio C Hamano | 2016-10-27 | 1 | -0/+4 |
|\ \ \ \ | |/ / / | | / / | |/ / |/| | | |||||
| * | | abbrev: auto size the default abbreviationlt/abbrev-auto | Linus Torvalds | 2016-10-03 | 1 | -0/+1 |
| * | | abbrev: add FALLBACK_DEFAULT_ABBREV to prepare for auto sizing | Junio C Hamano | 2016-10-03 | 1 | -0/+3 |
* | | | Merge branch 'jk/fetch-quick-tag-following' | Junio C Hamano | 2016-10-26 | 1 | -0/+1 |
|\ \ \ | |||||
| * | | | fetch: use "quick" has_sha1_file for tag followingjk/fetch-quick-tag-following | Jeff King | 2016-10-14 | 1 | -0/+1 |
| * | | | Merge branch 'jk/reflog-date' into maint | Junio C Hamano | 2016-09-08 | 1 | -1/+2 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'jc/renormalize-merge-kill-safer-crlf' into maint | Junio C Hamano | 2016-09-08 | 1 | -0/+1 |
| |\ \ \ \ | |||||
* | \ \ \ \ | Merge branch 'bw/ls-files-recurse-submodules' | Junio C Hamano | 2016-10-26 | 1 | -0/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | git: make super-prefix option | Brandon Williams | 2016-10-10 | 1 | -0/+2 |
* | | | | | | | Merge branch 'jk/quarantine-received-objects' | Junio C Hamano | 2016-10-17 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | tmp-objdir: put quarantine information in the environment | Jeff King | 2016-10-10 | 1 | -0/+1 |
* | | | | | | | Merge branch 'jk/alt-odb-cleanup' | Junio C Hamano | 2016-10-17 | 1 | -3/+33 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | alternates: store scratch buffer as strbuf | Jeff King | 2016-10-10 | 1 | -2/+11 |
| * | | | | | | alternates: use a separate scratch space | Jeff King | 2016-10-10 | 1 | -1/+4 |
| * | | | | | | alternates: provide helper for allocating alternate | Jeff King | 2016-10-10 | 1 | -0/+6 |
| * | | | | | | alternates: provide helper for adding to alternates list | Jeff King | 2016-10-10 | 1 | -1/+13 |
* | | | | | | | Merge branch 'jk/pack-objects-optim-mru' | Junio C Hamano | 2016-10-10 | 1 | -0/+8 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | sha1_file: make packed_object_info public | Jeff King | 2016-08-11 | 1 | -0/+1 |
| * | | | | | | | provide an initializer for "struct object_info" | Jeff King | 2016-08-11 | 1 | -0/+7 |
* | | | | | | | | Merge branch 'jk/ambiguous-short-object-names' | Junio C Hamano | 2016-10-06 | 1 | -0/+7 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | / | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | get_short_sha1: make default disambiguation configurable | Jeff King | 2016-09-27 | 1 | -0/+2 |
| * | | | | | | get_sha1: detect buggy calls with multiple disambiguators | Jeff King | 2016-09-26 | 1 | -0/+5 |
* | | | | | | | Merge branch 'nd/init-core-worktree-in-multi-worktree-world' | Junio C Hamano | 2016-10-03 | 1 | -2/+3 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | init: call set_git_dir_init() from within init_db() | Nguyễn Thái Ngọc Duy | 2016-09-25 | 1 | -2/+3 |
* | | | | | | | | Merge branch 'rs/checkout-init-macro' | Junio C Hamano | 2016-09-26 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | introduce CHECKOUT_INITrs/checkout-init-macro | René Scharfe | 2016-09-22 | 1 | -0/+1 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'tg/add-chmod+x-fix' | Junio C Hamano | 2016-09-26 | 1 | -5/+7 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | add: modify already added files when --chmod is given | Thomas Gummerer | 2016-09-15 | 1 | -5/+5 |
| * | | | | | | | read-cache: introduce chmod_index_entry | Thomas Gummerer | 2016-09-15 | 1 | -0/+2 |
* | | | | | | | | Merge branch 'jk/setup-sequence-update' | Junio C Hamano | 2016-09-21 | 1 | -1/+13 |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | init: reset cached config when entering new repo | Jeff King | 2016-09-13 | 1 | -0/+7 |
| * | | | | | | | config: only read .git/config from configured repos | Jeff King | 2016-09-13 | 1 | -0/+6 |
| * | | | | | | | pager: make pager_program a file-local static | Jeff King | 2016-09-13 | 1 | -1/+0 |
* | | | | | | | | Merge branch 'bc/object-id' | Junio C Hamano | 2016-09-19 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | |||||
| * | | | | | | | sha1_name: convert get_sha1_mb to struct object_id | brian m. carlson | 2016-09-07 | 1 | -1/+1 |
| * | | | | | | | cache: convert struct cache_entry to use struct object_id | brian m. carlson | 2016-09-07 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'rs/hex2chr' | Junio C Hamano | 2016-09-12 | 1 | -0/+10 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | introduce hex2chr() for converting two hexadecimal digits to a characterrs/hex2chr | René Scharfe | 2016-09-07 | 1 | -0/+10 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
| * | | | | | | | Merge branch 'jk/reset-ident-time-per-commit' into maint | Junio C Hamano | 2016-08-12 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'jk/send-pack-stdio' into maint | Junio C Hamano | 2016-08-08 | 1 | -1/+0 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'nd/pack-ofs-4gb-limit' into maint | Junio C Hamano | 2016-08-08 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'jk/diff-submodule-diff-inline' | Junio C Hamano | 2016-09-12 | 1 | -6/+23 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | allow do_submodule_path to work even if submodule isn't checked out | Jacob Keller | 2016-08-31 | 1 | -2/+2 |
| * | | | | | | | | | | cache: add empty_tree_oid object and helper function | Jacob Keller | 2016-08-31 | 1 | -4/+21 |