Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jk/alloc-commit-id' | Junio C Hamano | 2014-07-22 | 1 | -0/+1 |
|\ | |||||
| * | alloc: factor out commit index | Jeff King | 2014-07-14 | 1 | -0/+1 |
* | | Merge branch 'kb/perf-trace' | Junio C Hamano | 2014-07-22 | 1 | -11/+2 |
|\ \ | |||||
| * | | trace: move trace declarations from cache.h to new trace.h | Karsten Blees | 2014-06-17 | 1 | -11/+2 |
* | | | Merge branch 'rs/ref-transaction-0' | Junio C Hamano | 2014-07-21 | 1 | -1/+3 |
|\ \ \ | |||||
| * | | | refs.c: make resolve_ref_unsafe set errno to something meaningful on error | Ronnie Sahlberg | 2014-07-14 | 1 | -1/+1 |
| * | | | lockfile.c: add a new public function unable_to_lock_message | Ronnie Sahlberg | 2014-07-14 | 1 | -0/+2 |
| |/ / | |||||
* | | | Merge branch 'kb/path-max-must-go' | Junio C Hamano | 2014-07-16 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | cache.h: rename cache_def_free to cache_def_clear | Karsten Blees | 2014-07-13 | 1 | -1/+1 |
* | | | | Merge branch 'nd/split-index' | Junio C Hamano | 2014-07-16 | 1 | -4/+23 |
|\ \ \ \ | |||||
| * | | | | t1700: new tests for split-index mode | Nguyễn Thái Ngọc Duy | 2014-06-13 | 1 | -0/+2 |
| * | | | | update-index: new options to enable/disable split index mode | Nguyễn Thái Ngọc Duy | 2014-06-13 | 1 | -0/+1 |
| * | | | | split-index: strip pathname of on-disk replaced entries | Nguyễn Thái Ngọc Duy | 2014-06-13 | 1 | -0/+1 |
| * | | | | split-index: do not invalidate cache-tree at read time | Nguyễn Thái Ngọc Duy | 2014-06-13 | 1 | -0/+1 |
| * | | | | read-cache: mark updated entries for split index | Nguyễn Thái Ngọc Duy | 2014-06-13 | 1 | -0/+2 |
| * | | | | read-cache: split-index mode | Nguyễn Thái Ngọc Duy | 2014-06-13 | 1 | -0/+3 |
| * | | | | read-cache: save index SHA-1 after reading | Nguyễn Thái Ngọc Duy | 2014-06-13 | 1 | -0/+1 |
| * | | | | entry.c: update cache_changed if refresh_cache is set in checkout_entry() | Nguyễn Thái Ngọc Duy | 2014-06-13 | 1 | -0/+1 |
| * | | | | cache-tree: mark istate->cache_changed on cache tree invalidation | Nguyễn Thái Ngọc Duy | 2014-06-13 | 1 | -0/+1 |
| * | | | | resolve-undo: be specific what part of the index has changed | Nguyễn Thái Ngọc Duy | 2014-06-13 | 1 | -0/+1 |
| * | | | | read-cache: be specific what part of the index has changed | Nguyễn Thái Ngọc Duy | 2014-06-13 | 1 | -0/+5 |
| * | | | | read-cache: store in-memory flags in the first 12 bits of ce_flags | Nguyễn Thái Ngọc Duy | 2014-06-13 | 1 | -1/+1 |
| * | | | | read-cache: relocate and unexport commit_locked_index() | Nguyễn Thái Ngọc Duy | 2014-06-13 | 1 | -1/+0 |
| * | | | | read-cache: new API write_locked_index instead of write_index/write_cache | Nguyễn Thái Ngọc Duy | 2014-06-13 | 1 | -2/+4 |
* | | | | | Merge branch 'kb/path-max-must-go' | Junio C Hamano | 2014-07-10 | 1 | -2/+6 |
|\ \ \ \ \ | | |/ / / | |/| | / | |_|_|/ |/| | | | |||||
| * | | | symlinks: remove PATH_MAX limitation | Karsten Blees | 2014-07-07 | 1 | -2/+6 |
| * | | | Merge branch 'ym/fix-opportunistic-index-update-race' into maint | Junio C Hamano | 2014-06-25 | 1 | -0/+3 |
| |\ \ \ | | |/ / | |/| | | |||||
* | | | | cleanup duplicate name_compare() functions | Jeremiah Mahler | 2014-06-20 | 1 | -1/+1 |
| |_|/ |/| | | |||||
* | | | Merge branch 'sk/windows-unc-path' | Junio C Hamano | 2014-06-16 | 1 | -1/+0 |
|\ \ \ | |||||
| * | | | Windows: allow using UNC path for git repository | Cezary Zawadka | 2014-06-10 | 1 | -1/+0 |
* | | | | Merge branch 'nd/status-auto-comment-char' | Junio C Hamano | 2014-06-06 | 1 | -0/+1 |
|\ \ \ \ | |||||
| * | | | | commit: allow core.commentChar=auto for character auto selection | Nguyễn Thái Ngọc Duy | 2014-05-19 | 1 | -0/+1 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'jk/squelch-compiler-warning-from-funny-error-macro' | Junio C Hamano | 2014-06-06 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | let clang use the constant-return error() macro | Jeff King | 2014-05-07 | 1 | -1/+1 |
| * | | | | inline constant return from error() function | Jeff King | 2014-05-07 | 1 | -1/+1 |
| | |/ / | |/| | | |||||
| * | | | Merge branch 'jk/commit-dates-parsing-fix' into maint | Junio C Hamano | 2014-03-18 | 1 | -0/+1 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'bk/refresh-missing-ok-in-merge-recursive' into maint | Junio C Hamano | 2014-03-18 | 1 | -1/+5 |
| |\ \ \ \ | |||||
* | \ \ \ \ | Merge branch 'jk/commit-date-approxidate' | Junio C Hamano | 2014-06-03 | 1 | -0/+7 |
|\ \ \ \ \ \ | |||||
| * | | | | | | pretty: make show_ident_date public | Jeff King | 2014-05-02 | 1 | -0/+7 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge branch 'ym/fix-opportunistic-index-update-race' | Junio C Hamano | 2014-06-03 | 1 | -0/+3 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | read-cache.c: verify index file before we opportunistically update it | Yiannis Marangos | 2014-04-10 | 1 | -0/+3 |
* | | | | | | Merge branch 'ks/tree-diff-nway' | Junio C Hamano | 2014-06-03 | 1 | -0/+15 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | tree-diff: rework diff_tree() to generate diffs for multiparent cases as well | Kirill Smelkov | 2014-04-07 | 1 | -0/+15 |
* | | | | | | Merge branch 'nd/tag-version-sort' | Junio C Hamano | 2014-03-21 | 1 | -0/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | tag: support --sort=<spec> | Nguyễn Thái Ngọc Duy | 2014-02-27 | 1 | -0/+2 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'mh/replace-refs-variable-rename' | Junio C Hamano | 2014-03-14 | 1 | -2/+25 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add docstrings for lookup_replace_object() and do_lookup_replace_object() | Michael Haggerty | 2014-02-28 | 1 | -0/+13 |
| * | | | | | | rename read_replace_refs to check_replace_refs | Michael Haggerty | 2014-02-20 | 1 | -2/+12 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'mh/object-code-cleanup' | Junio C Hamano | 2014-03-14 | 1 | -4/+64 |
|\ \ \ \ \ \ | |||||
| * | | | | | | sha1_file.c: document a bunch of functions defined in the file | Michael Haggerty | 2014-02-25 | 1 | -3/+63 |