summaryrefslogtreecommitdiffstats
path: root/builtin (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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-201-8/+19
| * | | | | commit-graph: create options for split filesDerrick Stolee2019-06-203-7/+23
| * | | | | commit-graph: add --split option to builtinDerrick Stolee2019-06-201-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
|\ \ \ \ \ \ \
| * | | | | | | multi-pack-index: prepare 'repack' subcommandDerrick Stolee2019-06-111-2/+10
| * | | | | | | multi-pack-index: prepare for 'expire' subcommandDerrick Stolee2019-06-111-1/+3
| * | | | | | | repack: refactor pack deletion for future useDerrick Stolee2019-06-111-12/+2
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'js/rebase-reschedule-applies-only-to-interactive'Junio C Hamano2019-07-121-3/+7
|\ \ \ \ \ \ \
| * | | | | | | rebase --am: ignore rebase.rescheduleFailedExecJohannes Schindelin2019-07-011-3/+7
* | | | | | | | Merge branch 'ds/fetch-disable-force-notice'Junio C Hamano2019-07-102-1/+40
|\ \ \ \ \ \ \ \
| * | | | | | | | pull: add --[no-]show-forced-updates passthroughDerrick Stolee2019-06-211-0/+7
| * | | | | | | | fetch: warn about forced updates in branch listingDerrick Stolee2019-06-211-1/+24
| * | | | | | | | fetch: add --[no-]show-forced-updates argumentDerrick Stolee2019-06-211-1/+10
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'jh/status-aheadbehind'Junio C Hamano2019-07-101-1/+18
|\ \ \ \ \ \ \ \
| * | | | | | | | status: ignore status.aheadbehind in porcelain formatsJeff Hostetler2019-06-211-4/+6
| * | | | | | | | status: add status.aheadbehind settingJeff Hostetler2019-06-211-1/+16
| |/ / / / / / /
* | | | | | | | Merge branch 'ms/submodule-foreach-fix'Junio C Hamano2019-07-101-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | submodule foreach: fix recursion of optionsMorian Sonnet2019-06-251-0/+1
* | | | | | | | | Merge branch 'jh/msvc'Junio C Hamano2019-07-101-3/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | cache-tree/blame: avoid reusing the DEBUG constantJeff Hostetler2019-06-201-3/+3
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'nd/switch-and-restore'Junio C Hamano2019-07-107-328/+592
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | switch: allow to switch in the middle of bisectNguyễn Thái Ngọc Duy2019-06-201-3/+1
| * | | | | | | | | doc: promote "git restore"Nguyễn Thái Ngọc Duy2019-05-072-2/+2
| * | | | | | | | | restore: support --patchNguyễn Thái Ngọc Duy2019-05-071-2/+4
| * | | | | | | | | restore: replace --force with --ignore-unmergedNguyễn Thái Ngọc Duy2019-05-071-9/+20
| * | | | | | | | | restore: default to --source=HEAD when only --staged is specifiedNguyễn Thái Ngọc Duy2019-05-071-0/+6
| * | | | | | | | | restore: reject invalid combinations with --stagedNguyễn Thái Ngọc Duy2019-05-071-0/+10
| * | | | | | | | | restore: add --worktree and --stagedNguyễn Thái Ngọc Duy2019-05-071-6/+68
| * | | | | | | | | checkout: factor out worktree checkout codeNguyễn Thái Ngọc Duy2019-05-071-49/+59
| * | | | | | | | | restore: disable overlay mode by defaultNguyễn Thái Ngọc Duy2019-05-071-4/+7