summaryrefslogtreecommitdiff
path: root/builtin
AgeCommit message (Expand)AuthorFilesLines
2019-08-22Merge branch 'mt/grep-submodules-working-tree'Libravatar Junio C Hamano1-4/+6
2019-08-19builtin/show-index: replace sha1_to_hexLibravatar brian m. carlson1-1/+1
2019-08-19builtin/receive-pack: replace sha1_to_hexLibravatar brian m. carlson1-4/+4
2019-08-19builtin/index-pack: replace sha1_to_hexLibravatar brian m. carlson1-2/+2
2019-08-19wt-status: convert struct wt_status to object_idLibravatar brian m. carlson1-2/+2
2019-08-19cache: remove null_sha1Libravatar brian m. carlson2-2/+2
2019-08-19builtin/worktree: switch null_sha1 to null_oidLibravatar brian m. carlson1-1/+1
2019-08-19builtin/repack: write object IDs of the proper lengthLibravatar brian m. carlson1-1/+1
2019-08-19show-index: switch hard-coded constants to the_hash_algoLibravatar brian m. carlson1-5/+6
2019-08-19builtin/rev-parse: switch to use the_hash_algoLibravatar brian m. carlson1-2/+3
2019-08-19builtin/blame: switch uses of GIT_SHA1_HEXSZ to the_hash_algoLibravatar brian m. carlson1-3/+4
2019-08-19builtin/receive-pack: switch to use the_hash_algoLibravatar brian m. carlson1-23/+21
2019-08-19patch-id: convert to use the_hash_algoLibravatar brian m. carlson1-5/+6
2019-08-19builtin/replace: make hash size independentLibravatar brian m. carlson1-3/+4
2019-08-19pull, fetch: add --set-upstream optionLibravatar Corentin BOMPARD2-1/+56
2019-08-19cache-tree: share code between functions writing an index as a treeLibravatar Elijah Newren1-1/+1
2019-08-19merge-recursive: remove useless parameter in merge_trees()Libravatar Elijah Newren1-3/+1
2019-08-19Ensure index matches head before invoking merge machinery, round NLibravatar Elijah Newren2-0/+6
2019-08-19merge-recursive: introduce an enum for detect_directory_renames valuesLibravatar Derrick Stolee1-1/+1
2019-08-16checkout: provide better conflict hunk description with detached HEADLibravatar Elijah Newren1-0/+8
2019-08-16checkout: remove duplicate codeLibravatar Elijah Newren1-7/+0
2019-08-13repo-settings: parse core.untrackedCacheLibravatar Derrick Stolee1-2/+4
2019-08-13repo-settings: consolidate some config settingsLibravatar Derrick Stolee2-11/+9
2019-08-13worktree remove: clarify error message on dirty worktreeLibravatar SZEDER Gábor1-1/+1
2019-08-13packfile: drop release_pack_memory()Libravatar Jeff King1-11/+0
2019-08-09Merge branch 'jk/no-system-includes-in-dot-c' into maintLibravatar Junio C Hamano2-2/+0
2019-08-07merge: --no-verify to bypass pre-merge-commit hookLibravatar Michael J Gruber1-2/+2
2019-08-07git-merge: honor pre-merge-commit hookLibravatar Michael J Gruber1-0/+12
2019-08-07merge: do no-verify like commitLibravatar Michael J Gruber1-3/+3
2019-08-06l10n: reformat some localized strings for v2.23.0Libravatar Jean-Noël Avila2-5/+12
2019-08-05commit-graph: error out on invalid commit oids in 'write --stdin-commits'Libravatar SZEDER Gábor1-1/+3
2019-08-05commit-graph: turn a group of write-related macro flags into an enumLibravatar SZEDER Gábor2-4/+4
2019-08-02Merge branch 'jc/log-mailmap-flip-defaults'Libravatar Junio C Hamano1-19/+2
2019-08-02checkout.c: unstage empty deleted ita filesLibravatar Varun Naik1-0/+1
2019-08-02log: really flip the --mailmap defaultLibravatar Junio C Hamano1-5/+2
2019-08-01tree-walk: add a strbuf wrapper for make_traverse_path()Libravatar Jeff King1-2/+3
2019-08-01tree-walk: accept a raw length for traverse_path_len()Libravatar Jeff King1-1/+1
2019-08-01Merge branch 'jk/repack-silence-auto-bitmap-warning'Libravatar Junio C Hamano2-22/+23
2019-08-01log: flip the --mailmap default unconditionallyLibravatar Junio C Hamano1-15/+1
2019-07-31Merge branch 'jk/no-system-includes-in-dot-c'Libravatar Junio C Hamano2-2/+0
2019-07-31tree-walk: drop oid from traverse_infoLibravatar Jeff King1-1/+1
2019-07-31setup_traverse_info(): stop copying oidLibravatar Jeff King1-1/+1
2019-07-31repack: simplify handling of auto-bitmaps and .keep filesLibravatar Jeff King1-15/+2
2019-07-31repack: silence warnings when auto-enabled bitmaps cannot be builtLibravatar Jeff King2-11/+25
2019-07-31rebase -r: do not (re-)generate root commits with `--root` *and* `--onto`Libravatar Johannes Schindelin1-2/+5
2019-07-31rebase -r: support merge strategies other than `recursive`Libravatar Johannes Schindelin1-9/+0
2019-07-31rebase: fold git-rebase--common into the -p backendLibravatar Johannes Schindelin1-2/+1
2019-07-31Drop unused git-rebase--am.shLibravatar Johannes Schindelin1-4/+0
2019-07-30grep: fix worktree case in submodulesLibravatar Matheus Tavares1-4/+6
2019-07-29Merge branch 'js/rebase-cleanup'Libravatar Junio C Hamano1-5/+1