Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Use OPT_SET_INT_F() for cmdline option specification | Nguyễn Thái Ngọc Duy | 2018-05-24 | 10 | -46/+45 |
* | Merge branch 'nd/pack-unreachable-objects-doc' | Junio C Hamano | 2018-05-23 | 1 | -0/+2 |
|\ | |||||
| * | pack-objects: validation and documentation about unreachable options | Nguyễn Thái Ngọc Duy | 2018-05-06 | 1 | -0/+2 |
* | | Merge branch 'em/status-rename-config' | Junio C Hamano | 2018-05-23 | 1 | -1/+1 |
|\ \ | |||||
| * | | wt-status: use settings from git_diff_ui_config | Eckhard S. Maaß | 2018-05-06 | 1 | -1/+1 |
* | | | Merge branch 'bc/format-patch-cover-no-attach' | Junio C Hamano | 2018-05-23 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | format-patch: make cover letters always text/plain | brian m. carlson | 2018-05-02 | 1 | -1/+1 |
| | |/ | |/| | |||||
* | | | Merge branch 'js/rebase-recreate-merge' | Junio C Hamano | 2018-05-23 | 3 | -10/+35 |
|\ \ \ | |||||
| * | | | rebase -i: introduce --rebase-merges=[no-]rebase-cousins | Johannes Schindelin | 2018-04-26 | 1 | -1/+8 |
| * | | | pull: accept --rebase=merges to recreate the branch topology | Johannes Schindelin | 2018-04-26 | 2 | -8/+24 |
| * | | | rebase-helper --make-script: introduce a flag to rebase merges | Johannes Schindelin | 2018-04-26 | 1 | -1/+3 |
| | |/ | |/| | |||||
* | | | Merge branch 'nd/pack-objects-pack-struct' | Junio C Hamano | 2018-05-23 | 1 | -128/+241 |
|\ \ \ | |||||
| * | | | pack-objects: shrink delta_size field in struct object_entry | Nguyễn Thái Ngọc Duy | 2018-04-16 | 1 | -10/+16 |
| * | | | pack-objects: shrink size field in struct object_entry | Nguyễn Thái Ngọc Duy | 2018-04-16 | 1 | -25/+80 |
| * | | | pack-objects: clarify the use of object_entry::size | Nguyễn Thái Ngọc Duy | 2018-04-16 | 1 | -3/+8 |
| * | | | pack-objects: don't check size when the object is bad | Nguyễn Thái Ngọc Duy | 2018-04-16 | 1 | -2/+2 |
| * | | | pack-objects: shrink z_delta_size field in struct object_entry | Nguyễn Thái Ngọc Duy | 2018-04-16 | 1 | -6/+18 |
| * | | | pack-objects: refer to delta objects by index instead of pointer | Nguyễn Thái Ngọc Duy | 2018-04-16 | 1 | -54/+63 |
| * | | | pack-objects: move in_pack out of struct object_entry | Nguyễn Thái Ngọc Duy | 2018-04-16 | 1 | -11/+17 |
| * | | | pack-objects: move in_pack_pos out of struct object_entry | Nguyễn Thái Ngọc Duy | 2018-04-16 | 1 | -1/+2 |
| * | | | pack-objects: use bitfield for object_entry::depth | Nguyễn Thái Ngọc Duy | 2018-04-16 | 1 | -0/+6 |
| * | | | pack-objects: use bitfield for object_entry::dfs_state | Nguyễn Thái Ngọc Duy | 2018-04-16 | 1 | -0/+3 |
| * | | | pack-objects: turn type and in_pack_type to bitfields | Nguyễn Thái Ngọc Duy | 2018-04-16 | 1 | -24/+35 |
* | | | | Merge branch 'tg/worktree-add-existing-branch' | Junio C Hamano | 2018-05-23 | 1 | -27/+74 |
|\ \ \ \ | |||||
| * | | | | worktree: teach "add" to check out existing branches | Thomas Gummerer | 2018-04-30 | 1 | -2/+11 |
| * | | | | worktree: factor out dwim_branch function | Thomas Gummerer | 2018-04-30 | 1 | -11/+18 |
| * | | | | worktree: improve message when creating a new worktree | Thomas Gummerer | 2018-04-30 | 1 | -2/+36 |
| * | | | | worktree: remove extra members from struct add_opts | Thomas Gummerer | 2018-04-30 | 1 | -17/+16 |
* | | | | | Merge branch 'js/deprecate-grafts' | Junio C Hamano | 2018-05-23 | 1 | -66/+168 |
|\ \ \ \ \ | |||||
| * | | | | | replace: introduce --convert-graft-file | Johannes Schindelin | 2018-04-30 | 1 | -1/+43 |
| * | | | | | replace: prepare create_graft() for converting graft files wholesale | Johannes Schindelin | 2018-04-30 | 1 | -3/+8 |
| * | | | | | replace: "libify" create_graft() and callees | Johannes Schindelin | 2018-04-30 | 1 | -57/+112 |
| * | | | | | replace: avoid using die() to indicate a bug | Johannes Schindelin | 2018-04-26 | 1 | -1/+1 |
| * | | | | | commit: Let the callback of for_each_mergetag return on error | Johannes Schindelin | 2018-04-26 | 1 | -4/+4 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'sb/oid-object-info' | Junio C Hamano | 2018-05-23 | 14 | -28/+34 |
|\ \ \ \ \ | |||||
| * | | | | | packfile: add repository argument to packed_object_info | Jonathan Nieder | 2018-04-26 | 1 | -1/+2 |
| * | | | | | cache.h: add repository argument to oid_object_info | Stefan Beller | 2018-04-26 | 14 | -24/+29 |
| * | | | | | cache.h: add repository argument to oid_object_info_extended | Stefan Beller | 2018-04-26 | 1 | -3/+3 |
* | | | | | | Merge branch 'bw/server-options' | Junio C Hamano | 2018-05-23 | 2 | -0/+9 |
|\ \ \ \ \ \ | |||||
| * | | | | | | fetch: send server options when using protocol v2 | Brandon Williams | 2018-04-24 | 1 | -0/+5 |
| * | | | | | | ls-remote: send server options when using protocol v2 | Brandon Williams | 2018-04-24 | 1 | -0/+4 |
| * | | | | | | Merge branch 'bw/protocol-v2' into HEAD | Junio C Hamano | 2018-04-24 | 9 | -10/+180 |
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge branch 'nd/repack-keep-pack' | Junio C Hamano | 2018-05-23 | 3 | -29/+240 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | pack-objects: show some progress when counting kept objects | Nguyễn Thái Ngọc Duy | 2018-04-16 | 1 | -6/+12 |
| * | | | | | | | gc --auto: exclude base pack if not enough mem to "repack -ad" | Nguyễn Thái Ngọc Duy | 2018-04-16 | 2 | -2/+98 |
| * | | | | | | | gc: handle a corner case in gc.bigPackThreshold | Nguyễn Thái Ngọc Duy | 2018-04-16 | 1 | -1/+7 |
| * | | | | | | | gc: add gc.bigPackThreshold config | Nguyễn Thái Ngọc Duy | 2018-04-16 | 1 | -6/+20 |
| * | | | | | | | gc: add --keep-largest-pack option | Nguyễn Thái Ngọc Duy | 2018-04-16 | 1 | -4/+41 |
| * | | | | | | | repack: add --keep-pack option | Nguyễn Thái Ngọc Duy | 2018-04-16 | 2 | -16/+68 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'ds/lazy-load-trees' | Junio C Hamano | 2018-05-23 | 5 | -13/+19 |
|\ \ \ \ \ \ \ |