summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sb/blame-color'Junio C Hamano2018-07-241-1/+3
|\
| * blame: prefer xsnprintf to strcpy for colorsJeff King2018-07-161-1/+3
* | Merge branch 'hs/push-cert-check-cleanup'Junio C Hamano2018-07-241-15/+2
|\ \
| * | builtin/receive-pack: use check_signature from gpg-interfaceHenning Schild2018-07-111-15/+2
* | | Merge branch 'jt/partial-clone-fsck-connectivity'Junio C Hamano2018-07-241-1/+1
|\ \ \
| * | | clone: check connectivity even if clone is partialJonathan Tan2018-07-091-1/+1
* | | | Merge branch 'tb/config-default'Junio C Hamano2018-07-241-12/+15
|\ \ \ \
| * | | | builtin/config: work around an unsized array forward declarationBeat Bolli2018-07-061-12/+15
* | | | | Merge branch 'jt/connectivity-check-after-unshallow'Junio C Hamano2018-07-242-58/+96
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | fetch-pack: write shallow, then check connectivityJonathan Tan2018-07-031-5/+10
| * | | | fetch-pack: put shallow info in output parameterBrandon Williams2018-06-282-6/+26
| * | | | fetch: refactor to make function args narrowerBrandon Williams2018-06-281-26/+26
| * | | | fetch: refactor fetch_refs into two functionsBrandon Williams2018-06-281-5/+18
| * | | | fetch: refactor the population of peer ref OIDsBrandon Williams2018-06-281-18/+18
* | | | | Merge branch 'ao/config-from-gitmodules'Junio C Hamano2018-07-182-18/+5
|\ \ \ \ \
| * | | | | submodule-config: add helper to get 'update-clone' config from .gitmodulesAntonio Ospite2018-06-261-4/+4
| * | | | | submodule-config: add helper function to get 'fetch' config from .gitmodulesAntonio Ospite2018-06-261-14/+1
* | | | | | Merge branch 'jk/branch-l-0-deprecation'Junio C Hamano2018-07-181-1/+21
|\ \ \ \ \ \
| * | | | | | branch: deprecate "-l" optionJeff King2018-06-221-1/+21
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'tb/grep-column'Junio C Hamano2018-07-181-0/+1
|\ \ \ \ \ \
| * | | | | | builtin/grep.c: add '--column' option to 'git-grep(1)'Taylor Blau2018-06-221-0/+1
| |/ / / / /
* | | | | | Merge branch 'jt/remove-pack-bitmap-global'Junio C Hamano2018-07-182-6/+14
|\ \ \ \ \ \
| * | | | | | pack-bitmap: add free functionJonathan Tan2018-06-212-0/+3
| * | | | | | pack-bitmap: remove bitmap_git global variableJonathan Tan2018-06-212-6/+11
| |/ / / / /
* | | | | | Merge branch 'xy/format-patch-prereq-patch-id-fix'Junio C Hamano2018-07-181-0/+1
|\ \ \ \ \ \
| * | | | | | format-patch: clear UNINTERESTING flag before prepare_basesXiaolong Ye2018-06-191-0/+1
* | | | | | | Merge branch 'sb/submodule-core-worktree'Junio C Hamano2018-07-181-0/+26
|\ \ \ \ \ \ \
| * | | | | | | submodule deinit: unset core.worktreeStefan Beller2018-06-191-0/+2
| * | | | | | | submodule: ensure core.worktree is set after updateStefan Beller2018-06-191-0/+24
* | | | | | | | Merge branch 'sb/object-store-grafts'Junio C Hamano2018-07-1834-51/+81
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | path.c: migrate global git_path_* to take a repository argumentStefan Beller2018-05-185-42/+43
| * | | | | | | shallow: add repository argument to is_repository_shallowStefan Beller2018-05-184-5/+6
| * | | | | | | shallow: add repository argument to register_shallowStefan Beller2018-05-182-2/+2
| * | | | | | | commit: add repository argument to register_commit_graftJonathan Nieder2018-05-161-1/+2
| * | | | | | | object-store: move object access functions to object-store.hStefan Beller2018-05-1627-0/+27
* | | | | | | | Merge branch 'nd/completion-negation'Junio C Hamano2018-06-281-4/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | completion: suppress some -no- optionsNguyễn Thái Ngọc Duy2018-05-291-4/+6
* | | | | | | | | Merge branch 'ms/send-pack-honor-config'Junio C Hamano2018-06-281-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | builtin/send-pack: populate the default configsMasaya Suzuki2018-06-121-1/+1
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'ab/refspec-init-fix'Junio C Hamano2018-06-282-2/+2
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | refspec: s/refspec_item_init/&_or_die/gÆvar Arnfjörð Bjarmason2018-06-112-2/+2
* | | | | | | | | Merge branch 'sb/plug-misc-leaks'Junio C Hamano2018-06-251-1/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | submodule--helper: plug mem leak in print_default_remoteStefan Beller2018-06-011-1/+2
* | | | | | | | | | Merge branch 'sg/update-ref-stdin-cleanup'Junio C Hamano2018-06-251-12/+13
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | update-ref --stdin: use skip_prefix()SZEDER Gábor2018-06-041-12/+13
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'nd/complete-config-vars'Junio C Hamano2018-06-255-57/+59
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | completion: drop the hard coded list of config varsNguyễn Thái Ngọc Duy2018-05-291-1/+8
| * | | | | | | | | | am: move advice.amWorkDir parsing back to advice.cNguyễn Thái Ngọc Duy2018-05-291-5/+1
| * | | | | | | | | | help: add --config to list all available configNguyễn Thái Ngọc Duy2018-05-294-0/+18
| * | | | | | | | | | Add and use generic name->id mapping code for color slot parsingNguyễn Thái Ngọc Duy2018-05-293-54/+35