summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Use OPT_SET_INT_F() for cmdline option specificationNguyễn Thái Ngọc Duy2018-05-2410-46/+45
* Merge branch 'nd/pack-unreachable-objects-doc'Junio C Hamano2018-05-231-0/+2
|\
| * pack-objects: validation and documentation about unreachable optionsNguyễn Thái Ngọc Duy2018-05-061-0/+2
* | Merge branch 'em/status-rename-config'Junio C Hamano2018-05-231-1/+1
|\ \
| * | wt-status: use settings from git_diff_ui_configEckhard S. Maaß2018-05-061-1/+1
* | | Merge branch 'bc/format-patch-cover-no-attach'Junio C Hamano2018-05-231-1/+1
|\ \ \
| * | | format-patch: make cover letters always text/plainbrian m. carlson2018-05-021-1/+1
| | |/ | |/|
* | | Merge branch 'js/rebase-recreate-merge'Junio C Hamano2018-05-233-10/+35
|\ \ \
| * | | rebase -i: introduce --rebase-merges=[no-]rebase-cousinsJohannes Schindelin2018-04-261-1/+8
| * | | pull: accept --rebase=merges to recreate the branch topologyJohannes Schindelin2018-04-262-8/+24
| * | | rebase-helper --make-script: introduce a flag to rebase mergesJohannes Schindelin2018-04-261-1/+3
| | |/ | |/|
* | | Merge branch 'nd/pack-objects-pack-struct'Junio C Hamano2018-05-231-128/+241
|\ \ \
| * | | pack-objects: shrink delta_size field in struct object_entryNguyễn Thái Ngọc Duy2018-04-161-10/+16
| * | | pack-objects: shrink size field in struct object_entryNguyễn Thái Ngọc Duy2018-04-161-25/+80
| * | | pack-objects: clarify the use of object_entry::sizeNguyễn Thái Ngọc Duy2018-04-161-3/+8
| * | | pack-objects: don't check size when the object is badNguyễn Thái Ngọc Duy2018-04-161-2/+2
| * | | pack-objects: shrink z_delta_size field in struct object_entryNguyễn Thái Ngọc Duy2018-04-161-6/+18
| * | | pack-objects: refer to delta objects by index instead of pointerNguyễn Thái Ngọc Duy2018-04-161-54/+63
| * | | pack-objects: move in_pack out of struct object_entryNguyễn Thái Ngọc Duy2018-04-161-11/+17
| * | | pack-objects: move in_pack_pos out of struct object_entryNguyễn Thái Ngọc Duy2018-04-161-1/+2
| * | | pack-objects: use bitfield for object_entry::depthNguyễn Thái Ngọc Duy2018-04-161-0/+6
| * | | pack-objects: use bitfield for object_entry::dfs_stateNguyễn Thái Ngọc Duy2018-04-161-0/+3
| * | | pack-objects: turn type and in_pack_type to bitfieldsNguyễn Thái Ngọc Duy2018-04-161-24/+35
* | | | Merge branch 'tg/worktree-add-existing-branch'Junio C Hamano2018-05-231-27/+74
|\ \ \ \
| * | | | worktree: teach "add" to check out existing branchesThomas Gummerer2018-04-301-2/+11
| * | | | worktree: factor out dwim_branch functionThomas Gummerer2018-04-301-11/+18
| * | | | worktree: improve message when creating a new worktreeThomas Gummerer2018-04-301-2/+36
| * | | | worktree: remove extra members from struct add_optsThomas Gummerer2018-04-301-17/+16
* | | | | Merge branch 'js/deprecate-grafts'Junio C Hamano2018-05-231-66/+168
|\ \ \ \ \
| * | | | | replace: introduce --convert-graft-fileJohannes Schindelin2018-04-301-1/+43
| * | | | | replace: prepare create_graft() for converting graft files wholesaleJohannes Schindelin2018-04-301-3/+8
| * | | | | replace: "libify" create_graft() and calleesJohannes Schindelin2018-04-301-57/+112
| * | | | | replace: avoid using die() to indicate a bugJohannes Schindelin2018-04-261-1/+1
| * | | | | commit: Let the callback of for_each_mergetag return on errorJohannes Schindelin2018-04-261-4/+4
| | |_|/ / | |/| | |
* | | | | Merge branch 'sb/oid-object-info'Junio C Hamano2018-05-2314-28/+34
|\ \ \ \ \
| * | | | | packfile: add repository argument to packed_object_infoJonathan Nieder2018-04-261-1/+2
| * | | | | cache.h: add repository argument to oid_object_infoStefan Beller2018-04-2614-24/+29
| * | | | | cache.h: add repository argument to oid_object_info_extendedStefan Beller2018-04-261-3/+3
* | | | | | Merge branch 'bw/server-options'Junio C Hamano2018-05-232-0/+9
|\ \ \ \ \ \
| * | | | | | fetch: send server options when using protocol v2Brandon Williams2018-04-241-0/+5
| * | | | | | ls-remote: send server options when using protocol v2Brandon Williams2018-04-241-0/+4
| * | | | | | Merge branch 'bw/protocol-v2' into HEADJunio C Hamano2018-04-249-10/+180
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'nd/repack-keep-pack'Junio C Hamano2018-05-233-29/+240
|\ \ \ \ \ \ \
| * | | | | | | pack-objects: show some progress when counting kept objectsNguyễn Thái Ngọc Duy2018-04-161-6/+12
| * | | | | | | gc --auto: exclude base pack if not enough mem to "repack -ad"Nguyễn Thái Ngọc Duy2018-04-162-2/+98
| * | | | | | | gc: handle a corner case in gc.bigPackThresholdNguyễn Thái Ngọc Duy2018-04-161-1/+7
| * | | | | | | gc: add gc.bigPackThreshold configNguyễn Thái Ngọc Duy2018-04-161-6/+20
| * | | | | | | gc: add --keep-largest-pack optionNguyễn Thái Ngọc Duy2018-04-161-4/+41
| * | | | | | | repack: add --keep-pack optionNguyễn Thái Ngọc Duy2018-04-162-16/+68
| |/ / / / / /
* | | | | | | Merge branch 'ds/lazy-load-trees'Junio C Hamano2018-05-235-13/+19
|\ \ \ \ \ \ \