Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jk/pack-objects-optim-mru' | Junio C Hamano | 2016-10-10 | 2 | -5/+92 |
|\ | |||||
| * | pack-objects: use mru list when iterating over packs | Jeff King | 2016-08-11 | 1 | -3/+7 |
| * | pack-objects: break delta cycles before delta-search phase | Jeff King | 2016-08-11 | 1 | -0/+84 |
| * | provide an initializer for "struct object_info" | Jeff King | 2016-08-11 | 1 | -3/+2 |
* | | Merge branch 'rs/qsort' | Junio C Hamano | 2016-10-10 | 10 | -31/+19 |
|\ \ | |||||
| * | | show-branch: use QSORT | René Scharfe | 2016-10-03 | 1 | -4/+2 |
| * | | use QSORT, part 2 | René Scharfe | 2016-09-30 | 2 | -3/+2 |
| * | | remove unnecessary check before QSORT | René Scharfe | 2016-09-30 | 1 | -6/+4 |
| * | | use QSORT | René Scharfe | 2016-09-30 | 8 | -20/+13 |
* | | | Merge branch 'rs/cocci' | Junio C Hamano | 2016-10-06 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | use strbuf_addstr() instead of strbuf_addf() with "%s", part 2 | René Scharfe | 2016-09-27 | 1 | -1/+1 |
* | | | | Merge branch 'jc/blame-abbrev' | Junio C Hamano | 2016-10-06 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | blame: use DEFAULT_ABBREV macro | Junio C Hamano | 2016-09-28 | 1 | -1/+1 |
* | | | | | Merge branch 'vn/revision-shorthand-for-side-branch-log' | Junio C Hamano | 2016-10-06 | 1 | -13/+41 |
|\ \ \ \ \ | |||||
| * | | | | | revision: new rev^-n shorthand for rev^n..rev | Vegard Nossum | 2016-09-27 | 1 | -13/+41 |
| |/ / / / | |||||
* | | | | | Merge branch 'jk/ambiguous-short-object-names' | Junio C Hamano | 2016-10-06 | 2 | -2/+4 |
|\ \ \ \ \ | |||||
| * | | | | | sha1_array: let callbacks interrupt iteration | Jeff King | 2016-09-26 | 2 | -2/+4 |
* | | | | | | Merge branch 'nd/init-core-worktree-in-multi-worktree-world' | Junio C Hamano | 2016-10-03 | 2 | -48/+37 |
|\ \ \ \ \ \ | |||||
| * | | | | | | init: kill git_link variable | Nguyễn Thái Ngọc Duy | 2016-09-26 | 1 | -12/+4 |
| * | | | | | | init: do not set unnecessary core.worktree | Nguyễn Thái Ngọc Duy | 2016-09-26 | 1 | -3/+6 |
| * | | | | | | init: kill set_git_dir_init() | Nguyễn Thái Ngọc Duy | 2016-09-26 | 1 | -29/+21 |
| * | | | | | | init: call set_git_dir_init() from within init_db() | Nguyễn Thái Ngọc Duy | 2016-09-26 | 2 | -15/+18 |
| * | | | | | | init: correct re-initialization from a linked worktree | Nguyễn Thái Ngọc Duy | 2016-09-26 | 1 | -1/+1 |
* | | | | | | | Merge branch 'rs/copy-array' | Junio C Hamano | 2016-10-03 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | use COPY_ARRAY | René Scharfe | 2016-09-26 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'jc/worktree-config' | Junio C Hamano | 2016-09-30 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | |||||
| * | | | | | | | worktree: honor configuration variables | Junio C Hamano | 2016-09-27 | 1 | -0/+2 |
| | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | Merge branch 'ah/misc-message-fixes' into maint | Junio C Hamano | 2016-09-19 | 2 | -2/+2 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'jc/forbid-symbolic-ref-d-HEAD' into maint | Junio C Hamano | 2016-09-19 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ | Merge branch 'jk/clone-recursive-progress' | Junio C Hamano | 2016-09-27 | 2 | -5/+29 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | clone: pass --progress decision to recursive submodules | Jeff King | 2016-09-22 | 2 | -5/+29 |
* | | | | | | | | | | Merge branch 'rs/checkout-init-macro' | Junio C Hamano | 2016-09-27 | 2 | -3/+2 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | introduce CHECKOUT_INIT | René Scharfe | 2016-09-22 | 2 | -3/+2 |
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'tg/add-chmod+x-fix' | Junio C Hamano | 2016-09-27 | 4 | -36/+33 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | add: modify already added files when --chmod is given | Thomas Gummerer | 2016-09-15 | 3 | -21/+30 |
| * | | | | | | | | | | read-cache: introduce chmod_index_entry | Thomas Gummerer | 2016-09-15 | 1 | -14/+2 |
| * | | | | | | | | | | update-index: add test for chmod flags | Thomas Gummerer | 2016-09-15 | 1 | -1/+1 |
* | | | | | | | | | | | Merge branch 'nd/checkout-disambiguation' | Junio C Hamano | 2016-09-27 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | checkout: fix ambiguity check in subdir | Nguyễn Thái Ngọc Duy | 2016-09-21 | 1 | -2/+2 |
| * | | | | | | | | | | | checkout: add some spaces between code and comment | Nguyễn Thái Ngọc Duy | 2016-09-08 | 1 | -1/+1 |
| | |_|_|/ / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'jt/format-patch-rfc' | Junio C Hamano | 2016-09-27 | 1 | -1/+9 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | format-patch: add "--rfc" for the common case of [RFC PATCH] | Josh Triplett | 2016-09-21 | 1 | -1/+9 |
| |/ / / / / / / / / / | |||||
* | | | | | | | | | | | Merge branch 'mh/diff-indent-heuristic' | Junio C Hamano | 2016-09-27 | 1 | -0/+12 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | blame: honor the diff heuristic options and config | Michael Haggerty | 2016-09-19 | 1 | -0/+12 |
* | | | | | | | | | | | | Merge branch 'rs/cocci' | Junio C Hamano | 2016-09-27 | 3 | -4/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | / / | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | use strbuf_addstr() for adding constant strings to a strbuf, part 2 | René Scharfe | 2016-09-15 | 3 | -4/+5 |
| | |/ / / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'jk/reduce-gc-aggressive-depth' | Junio C Hamano | 2016-09-22 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | gc: default aggressive depth to 50 | Jeff King | 2016-08-11 | 1 | -1/+1 |
* | | | | | | | | | | | Merge branch 'va/i18n' | Junio C Hamano | 2016-09-22 | 8 | -103/+106 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | i18n: update-index: mark warnings for translation | Vasco Almeida | 2016-09-15 | 1 | -6/+6 |