summaryrefslogtreecommitdiff
path: root/builtin
AgeCommit message (Expand)AuthorFilesLines
2020-08-03merge: make merge.renormalize work for all uses of merge machineryLibravatar Elijah Newren2-11/+0
2020-07-30Merge branch 'rs/grep-simpler-parse-object-or-die-call' into masterLibravatar Junio C Hamano1-1/+1
2020-07-30Merge branch 'ct/mv-unmerged-path-error' into masterLibravatar Junio C Hamano1-2/+5
2020-07-30Merge branch 'hn/reftable' into masterLibravatar Junio C Hamano1-2/+1
2020-07-30Merge branch 'bw/fail-cloning-into-non-empty' into masterLibravatar Junio C Hamano1-2/+10
2020-07-30Merge branch 'ds/commit-graph-bloom-updates' into masterLibravatar Junio C Hamano1-1/+4
2020-07-28grep: avoid using oid_to_hex() with parse_object_or_die()Libravatar René Scharfe1-1/+1
2020-07-20git-mv: improve error message for conflicted fileLibravatar Chris Torek1-2/+5
2020-07-15Merge branch 'tb/commit-graph-no-check-oids' into masterLibravatar Junio C Hamano1-3/+1
2020-07-15commit-graph: fix "Collecting commits from input" progress lineLibravatar SZEDER Gábor1-3/+1
2020-07-10bisect: treat BISECT_HEAD as a pseudo refLibravatar Han-Wen Nienhuys1-2/+1
2020-07-10git clone: don't clone into non-empty directoryLibravatar Ben Wijen1-2/+10
2020-07-09Merge branch 'ct/diff-with-merge-base-clarification' into masterLibravatar Junio C Hamano1-1/+1
2020-07-09Merge branch 'cc/cat-file-usage-update' into masterLibravatar Junio C Hamano1-1/+1
2020-07-08diff: check for merge bases before assigning sym->baseLibravatar Jeff King1-1/+1
2020-07-06Merge branch 'jk/fast-export-anonym-alt'Libravatar Junio C Hamano1-55/+107
2020-07-06Merge branch 'js/default-branch-name'Libravatar Junio C Hamano3-11/+37
2020-07-06Merge branch 'cb/is-descendant-of'Libravatar Junio C Hamano1-1/+2
2020-07-06Merge branch 'es/get-worktrees-unsort'Libravatar Junio C Hamano5-10/+30
2020-07-06Merge branch 'ak/commit-graph-to-slab'Libravatar Junio C Hamano2-2/+2
2020-07-06Merge branch 'bc/sha-256-part-2'Libravatar Junio C Hamano5-10/+56
2020-07-01cat-file: add missing [=<format>] to usage/synopsisLibravatar Christian Couder1-1/+1
2020-07-01commit-graph: persist existence of changed-pathsLibravatar Derrick Stolee1-1/+4
2020-06-29Merge branch 'sk/diff-files-show-i-t-a-as-new'Libravatar Junio C Hamano1-0/+7
2020-06-29Merge branch 'rs/pull-leakfix'Libravatar Junio C Hamano1-0/+1
2020-06-29Merge branch 'dl/diff-usage-comment-update'Libravatar Junio C Hamano1-3/+12
2020-06-29Merge branch 'xl/upgrade-repo-format'Libravatar Junio C Hamano2-3/+2
2020-06-25fast-export: use local array to store anonymized oidLibravatar Jeff King1-4/+4
2020-06-25fast-export: anonymize "master" refnameLibravatar Jeff King1-7/+0
2020-06-25fast-export: allow seeding the anonymized mappingLibravatar Jeff King1-1/+49
2020-06-25Merge branch 'jt/cdn-offload'Libravatar Junio C Hamano2-6/+87
2020-06-25Merge branch 'ss/submodule-set-branch-in-c'Libravatar Junio C Hamano1-0/+44
2020-06-25Merge branch 'dl/branch-cleanup'Libravatar Junio C Hamano1-1/+1
2020-06-25Merge branch 'ct/diff-with-merge-base-clarification'Libravatar Junio C Hamano1-14/+118
2020-06-25Merge branch 'en/clean-cleanups'Libravatar Junio C Hamano1-11/+38
2020-06-24clone: use configured default branch name when appropriateLibravatar Johannes Schindelin1-3/+7
2020-06-24init: allow setting the default for the initial branch name via the configLibravatar Don Goodman-Wilson1-1/+1
2020-06-24init: allow specifying the initial branch name for the new repositoryLibravatar Johannes Schindelin2-7/+29
2020-06-24submodule: fall back to remote's HEAD for missing remote.<name>.branchLibravatar Johannes Schindelin1-1/+1
2020-06-23fast-export: add a "data" callback parameter to anonymize_str()Libravatar Jeff King1-13/+14
2020-06-23fast-export: move global "idents" anonymize hashmap into functionLibravatar Jeff King1-1/+1
2020-06-23fast-export: use a flex array to store anonymized entriesLibravatar Jeff King1-3/+2
2020-06-23fast-export: stop storing lengths in anonymized hashmapsLibravatar Jeff King1-10/+18
2020-06-23fast-export: tighten anonymize_mem() interface to handle only stringsLibravatar Jeff King1-27/+26
2020-06-23fast-export: store anonymized oids as hex stringsLibravatar Jeff King1-12/+16
2020-06-23fast-export: use xmemdupz() for anonymizing oidsLibravatar Jeff King1-1/+1
2020-06-23builtin/diff: fix botched update of usage commentLibravatar Denton Liu1-4/+1
2020-06-23commit-reach: avoid is_descendant_of() shimLibravatar Carlo Marcelo Arenas Belón1-1/+2
2020-06-22Merge branch 'es/worktree-duplicate-paths'Libravatar Junio C Hamano1-35/+93
2020-06-22diff-files: treat "i-t-a" files as "not-in-index"Libravatar Srinidhi Kaushik1-0/+7