summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* l10n: reformat some localized strings for v2.23.0Jean-Noël Avila2019-08-062-5/+12
* Merge branch 'jc/log-mailmap-flip-defaults'Junio C Hamano2019-08-021-19/+2
|\
| * log: really flip the --mailmap defaultJunio C Hamano2019-08-021-5/+2
| * log: flip the --mailmap default unconditionallyJunio C Hamano2019-08-011-15/+1
* | Merge branch 'jk/repack-silence-auto-bitmap-warning'Junio C Hamano2019-08-012-22/+23
|\ \ | |/ |/|
| * repack: simplify handling of auto-bitmaps and .keep filesJeff King2019-07-311-15/+2
| * repack: silence warnings when auto-enabled bitmaps cannot be builtJeff King2019-07-312-11/+25
* | Merge branch 'jk/no-system-includes-in-dot-c'Junio C Hamano2019-07-312-2/+0
|\ \ | |/ |/|
| * verify-tag: drop signal.h includeJeff King2019-06-192-2/+0
* | Merge branch 'js/rebase-cleanup'Junio C Hamano2019-07-291-5/+1
|\ \
| * | git: mark cmd_rebase as requiring a worktreeJohannes Schindelin2019-07-251-4/+0
| * | rebase: fix white-spaceJohannes Schindelin2019-07-251-1/+1
| |/
* | Merge branch 'jc/denoise-rm-to-resolve'Junio C Hamano2019-07-251-1/+1
|\ \
| * | rm: resolving by removal is not a warning-worthy eventJunio C Hamano2019-07-181-1/+1
* | | Merge branch 'js/clean-report-too-long-a-path'Junio C Hamano2019-07-251-1/+2
|\ \ \
| * | | clean: show an error message when the path is too longJohannes Schindelin2019-07-191-1/+2
| | |/ | |/|
* | | Merge branch 'tg/stash-keep-index-with-removed-paths'Junio C Hamano2019-07-251-23/+9
|\ \ \
| * | | stash: fix handling removed files with --keep-indexThomas Gummerer2019-07-161-23/+9
| |/ /
* | | Merge branch 'mt/dir-iterator-updates'Junio C Hamano2019-07-251-32/+43
|\ \ \
| * | | clone: replace strcmp by fspathcmpMatheus Tavares2019-07-111-1/+1
| * | | clone: use dir-iterator to avoid explicit dir traversalMatheus Tavares2019-07-111-22/+25
| * | | clone: extract function from copy_or_link_directoryMatheus Tavares2019-07-111-8/+16
| * | | clone: copy hidden paths at local cloneMatheus Tavares2019-07-111-1/+1
| * | | clone: better handle symlinked files at .git/objects/Matheus Tavares2019-07-111-1/+1
* | | | Merge branch 'ac/log-use-mailmap-by-default-transition'Junio C Hamano2019-07-251-2/+24
|\ \ \ \
| * | | | log: add warning for unspecified log.mailmap settingAriadne Conill2019-07-151-2/+24
* | | | | Merge branch 'ab/test-env'Junio C Hamano2019-07-251-0/+95
|\ \ \ \ \
| * | | | | env--helper: mark a file-local symbol as staticRamsay Jones2019-07-111-1/+1
| * | | | | env--helper: new undocumented builtin wrapping git_env_*()Ævar Arnfjörð Bjarmason2019-06-211-0/+95
* | | | | | Merge branch 'ea/merge-code-cleanup'Junio C Hamano2019-07-191-33/+20
|\ \ \ \ \ \
| * | | | | | builtin/merge.c - cleanup of code in for-cycle that tests strategiesEdmundo Carmona Antoranz2019-07-091-33/+20
* | | | | | | Merge branch 'ew/repack-with-bitmaps-by-default'Junio C Hamano2019-07-191-2/+16
|\ \ \ \ \ \ \
| * | | | | | | repack: disable bitmaps-by-default if .keep files existEric Wong2019-07-011-2/+16
* | | | | | | | Merge branch 'jk/check-connected-with-alternates'Junio C Hamano2019-07-191-1/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | object-store.h: move for_each_alternate_ref() from transport.hJeff King2019-07-011-1/+0
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'nd/tree-walk-with-repo'Junio C Hamano2019-07-198-19/+27
|\ \ \ \ \ \ \ \
| * | | | | | | | tree-walk.c: remove the_repo from get_tree_entry()Nguyễn Thái Ngọc Duy2019-06-272-2/+2
| * | | | | | | | tree-walk.c: remove the_repo from fill_tree_descriptor()Nguyễn Thái Ngọc Duy2019-06-273-13/+17
| * | | | | | | | sha1-file.c: remove the_repo from read_object_with_reference()Nguyễn Thái Ngọc Duy2019-06-273-4/+8
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'ra/cherry-pick-revert-skip'Junio C Hamano2019-07-192-5/+13
|\ \ \ \ \ \ \ \
| * | | | | | | | cherry-pick/revert: advise using --skipRohit Ashiwal2019-07-021-5/+8
| * | | | | | | | cherry-pick/revert: add --skip optionRohit Ashiwal2019-07-021-0/+5
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'ds/commit-graph-incremental'Junio C Hamano2019-07-193-16/+47
|\ \ \ \ \ \ \ \
| * | | | | | | | commit-graph: verify chains with --shallow modeDerrick Stolee2019-06-191-8/+19
| * | | | | | | | commit-graph: create options for split filesDerrick Stolee2019-06-193-7/+23
| * | | | | | | | commit-graph: add --split option to builtinDerrick Stolee2019-06-191-3/+7
* | | | | | | | | Merge branch 'br/blame-ignore'Junio C Hamano2019-07-191-0/+56
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | blame: add config options for the output of ignored or unblamable linesBarret Rhoden2019-05-161-0/+18
| * | | | | | | | | blame: add the ability to ignore commits and their changesBarret Rhoden2019-05-161-0/+38
* | | | | | | | | | Merge branch 'ds/midx-expire-repack'Junio C Hamano2019-07-192-14/+14
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | |