summaryrefslogtreecommitdiff
path: root/git.c
Commit message (Expand)AuthorAgeFilesLines
* merge-tree: add option parsing and initial shell for real merge functionElijah Newren2022-06-221-1/+1
* Merge branch 'jh/builtin-fsmonitor-part3'Junio C Hamano2022-06-101-1/+1
|\
| * fsmonitor--daemon: allow --super-prefix argumentJeff Hostetler2022-05-261-1/+1
* | Merge branch 'gf/shorthand-version-and-help'Junio C Hamano2022-05-201-4/+7
|\ \ | |/ |/|
| * cli: add -v and -h shorthandsGarrit Franke2022-03-311-4/+7
* | fsmonitor--daemon: add a built-in fsmonitor daemonJeff Hostetler2022-03-251-0/+1
|/
* Merge branch 'ab/grep-patterntype'Junio C Hamano2022-02-251-0/+1
|\
| * built-ins: trust the "prefix" from run_builtin()Ævar Arnfjörð Bjarmason2022-02-151-0/+1
* | Merge branch 'ab/config-based-hooks-2'Junio C Hamano2022-02-091-0/+1
|\ \ | |/ |/|
| * hook: add 'run' subcommandEmily Shaffer2022-01-071-0/+1
* | i18n: factorize "no directory given for --foo"Jean-Noël Avila2022-01-051-3/+3
|/
* Merge branch 'ld/sparse-diff-blame'Junio C Hamano2021-12-211-18/+21
|\
| * git: ensure correct git directory setup with -hLessley Dennington2021-12-061-18/+21
* | Merge branch 'js/retire-preserve-merges'Junio C Hamano2021-10-181-1/+0
|\ \ | |/ |/|
| * rebase: drop the internal `rebase--interactive` commandJohannes Schindelin2021-09-071-1/+0
* | midx: disallow running outside of a repositoryTaylor Blau2021-09-011-1/+1
|/
* Merge branch 'ps/config-env-option-with-separate-value'Junio C Hamano2021-05-071-0/+8
|\
| * git: support separate arg for `--config-env`'s valuePatrick Steinhardt2021-04-301-0/+8
* | Merge branch 'mt/parallel-checkout-part-2'Junio C Hamano2021-04-301-0/+2
|\ \
| * | parallel-checkout: make it truly parallelMatheus Tavares2021-04-191-0/+2
* | | Merge branch 'tb/precompose-prefix-simplify'Junio C Hamano2021-04-131-1/+1
|\ \ \ | |/ / |/| |
| * | macOS: precompose startup_info->prefixTorsten Bögershausen2021-04-051-1/+1
* | | Merge branch 'tb/precompose-prefix-too'Junio C Hamano2021-02-121-1/+1
|\ \ \ | |/ /
| * | MacOS: precompose_argv_prefix()Torsten Bögershausen2021-02-031-1/+1
* | | Merge branch 'ps/config-env-pairs'Junio C Hamano2021-01-251-0/+3
|\ \ \ | |/ / |/| / | |/
| * config: add new way to pass config via `--config-env`Patrick Steinhardt2021-01-121-1/+3
| * git: add `--super-prefix` to usage stringPatrick Steinhardt2021-01-061-0/+1
* | maintenance: fix SEGFAULT when no repositoryRafael Silva2020-11-301-1/+1
|/
* Merge branch 'ds/maintenance-part-3'Junio C Hamano2020-11-181-0/+1
|\
| * for-each-repo: run subcommands on configured reposDerrick Stolee2020-09-251-0/+1
* | Merge branch 'js/no-builtins-on-disk-option'Junio C Hamano2020-10-081-0/+19
|\ \
| * | help: do not expect built-in commands to be hardlinkedJohannes Schindelin2020-10-071-0/+19
* | | Merge branch 'ds/maintenance-part-1'Junio C Hamano2020-09-251-0/+1
|\ \ \ | |/ / |/| / | |/
| * maintenance: create basic maintenance runnerDerrick Stolee2020-09-171-0/+1
* | make git-fast-import a builtinJeff King2020-08-131-0/+1
* | make git-bugreport a builtinJeff King2020-08-131-0/+1
* | make credential helpers builtinsJeff King2020-08-131-0/+3
|/
* strvec: rename struct fieldsJeff King2020-07-301-5/+5
* strvec: convert more callers away from argv_array nameJeff King2020-07-281-11/+11
* Merge branch 'ta/wait-on-aliased-commands-upon-signal' into masterJunio C Hamano2020-07-151-1/+3
|\
| * Wait for child on signal death for aliases to externalsTrygve Aaberge2020-07-071-0/+2
| * Wait for child on signal death for aliases to builtinsTrygve Aaberge2020-07-071-1/+1
* | Merge branch 'bc/sha-256-part-2'Junio C Hamano2020-07-061-1/+1
|\ \
| * | builtin/show-index: provide options to determine hash algobrian m. carlson2020-05-271-1/+1
* | | Merge branch 'tb/shallow-cleanup'Junio C Hamano2020-05-131-0/+1
|\ \ \ | |/ / |/| |
| * | shallow: extract a header file for shallow-related functionsTaylor Blau2020-04-301-0/+1
| |/
* | Merge branch 'js/trace2-env-vars'Junio C Hamano2020-04-221-0/+3
|\ \
| * | trace2: teach Git to log environment variablesJosh Steadmon2020-03-231-0/+3
| |/
* | stash: remove the stash.useBuiltin settingThomas Gummerer2020-03-051-6/+1
|/
* sparse-checkout: create builtin with 'list' subcommandDerrick Stolee2019-11-221-0/+1