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