Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'ab/test-env' | Junio C Hamano | 2019-07-25 | 1 | -0/+95 |
|\ | |||||
| * | env--helper: mark a file-local symbol as static | Ramsay Jones | 2019-07-11 | 1 | -1/+1 |
| * | env--helper: new undocumented builtin wrapping git_env_*() | Ævar Arnfjörð Bjarmason | 2019-06-21 | 1 | -0/+95 |
* | | Merge branch 'ea/merge-code-cleanup' | Junio C Hamano | 2019-07-19 | 1 | -33/+20 |
|\ \ | |||||
| * | | builtin/merge.c - cleanup of code in for-cycle that tests strategies | Edmundo Carmona Antoranz | 2019-07-09 | 1 | -33/+20 |
* | | | Merge branch 'ew/repack-with-bitmaps-by-default' | Junio C Hamano | 2019-07-19 | 1 | -2/+16 |
|\ \ \ | |||||
| * | | | repack: disable bitmaps-by-default if .keep files exist | Eric Wong | 2019-07-01 | 1 | -2/+16 |
* | | | | Merge branch 'jk/check-connected-with-alternates' | Junio C Hamano | 2019-07-19 | 1 | -1/+0 |
|\ \ \ \ | |||||
| * | | | | object-store.h: move for_each_alternate_ref() from transport.h | Jeff King | 2019-07-01 | 1 | -1/+0 |
* | | | | | Merge branch 'nd/tree-walk-with-repo' | Junio C Hamano | 2019-07-19 | 8 | -19/+27 |
|\ \ \ \ \ | |||||
| * | | | | | tree-walk.c: remove the_repo from get_tree_entry() | Nguyễn Thái Ngọc Duy | 2019-06-27 | 2 | -2/+2 |
| * | | | | | tree-walk.c: remove the_repo from fill_tree_descriptor() | Nguyễn Thái Ngọc Duy | 2019-06-27 | 3 | -13/+17 |
| * | | | | | sha1-file.c: remove the_repo from read_object_with_reference() | Nguyễn Thái Ngọc Duy | 2019-06-27 | 3 | -4/+8 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'ra/cherry-pick-revert-skip' | Junio C Hamano | 2019-07-19 | 2 | -5/+13 |
|\ \ \ \ \ | |||||
| * | | | | | cherry-pick/revert: advise using --skip | Rohit Ashiwal | 2019-07-02 | 1 | -5/+8 |
| * | | | | | cherry-pick/revert: add --skip option | Rohit Ashiwal | 2019-07-02 | 1 | -0/+5 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'ds/commit-graph-incremental' | Junio C Hamano | 2019-07-19 | 3 | -16/+47 |
|\ \ \ \ \ | |||||
| * | | | | | commit-graph: verify chains with --shallow mode | Derrick Stolee | 2019-06-20 | 1 | -8/+19 |
| * | | | | | commit-graph: create options for split files | Derrick Stolee | 2019-06-20 | 3 | -7/+23 |
| * | | | | | commit-graph: add --split option to builtin | Derrick Stolee | 2019-06-20 | 1 | -3/+7 |
* | | | | | | Merge branch 'br/blame-ignore' | Junio C Hamano | 2019-07-19 | 1 | -0/+56 |
|\ \ \ \ \ \ | |||||
| * | | | | | | blame: add config options for the output of ignored or unblamable lines | Barret Rhoden | 2019-05-16 | 1 | -0/+18 |
| * | | | | | | blame: add the ability to ignore commits and their changes | Barret Rhoden | 2019-05-16 | 1 | -0/+38 |
* | | | | | | | Merge branch 'ds/midx-expire-repack' | Junio C Hamano | 2019-07-19 | 2 | -14/+14 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | multi-pack-index: prepare 'repack' subcommand | Derrick Stolee | 2019-06-11 | 1 | -2/+10 |
| * | | | | | | | multi-pack-index: prepare for 'expire' subcommand | Derrick Stolee | 2019-06-11 | 1 | -1/+3 |
| * | | | | | | | repack: refactor pack deletion for future use | Derrick Stolee | 2019-06-11 | 1 | -12/+2 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge branch 'js/rebase-reschedule-applies-only-to-interactive' | Junio C Hamano | 2019-07-12 | 1 | -3/+7 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | rebase --am: ignore rebase.rescheduleFailedExec | Johannes Schindelin | 2019-07-01 | 1 | -3/+7 |
* | | | | | | | | Merge branch 'ds/fetch-disable-force-notice' | Junio C Hamano | 2019-07-10 | 2 | -1/+40 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | pull: add --[no-]show-forced-updates passthrough | Derrick Stolee | 2019-06-21 | 1 | -0/+7 |
| * | | | | | | | | fetch: warn about forced updates in branch listing | Derrick Stolee | 2019-06-21 | 1 | -1/+24 |
| * | | | | | | | | fetch: add --[no-]show-forced-updates argument | Derrick Stolee | 2019-06-21 | 1 | -1/+10 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'jh/status-aheadbehind' | Junio C Hamano | 2019-07-10 | 1 | -1/+18 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | status: ignore status.aheadbehind in porcelain formats | Jeff Hostetler | 2019-06-21 | 1 | -4/+6 |
| * | | | | | | | | status: add status.aheadbehind setting | Jeff Hostetler | 2019-06-21 | 1 | -1/+16 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'ms/submodule-foreach-fix' | Junio C Hamano | 2019-07-10 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | submodule foreach: fix recursion of options | Morian Sonnet | 2019-06-25 | 1 | -0/+1 |
* | | | | | | | | | Merge branch 'jh/msvc' | Junio C Hamano | 2019-07-10 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | cache-tree/blame: avoid reusing the DEBUG constant | Jeff Hostetler | 2019-06-20 | 1 | -3/+3 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'nd/switch-and-restore' | Junio C Hamano | 2019-07-10 | 7 | -328/+592 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | switch: allow to switch in the middle of bisect | Nguyễn Thái Ngọc Duy | 2019-06-20 | 1 | -3/+1 |
| * | | | | | | | | | doc: promote "git restore" | Nguyễn Thái Ngọc Duy | 2019-05-07 | 2 | -2/+2 |
| * | | | | | | | | | restore: support --patch | Nguyễn Thái Ngọc Duy | 2019-05-07 | 1 | -2/+4 |
| * | | | | | | | | | restore: replace --force with --ignore-unmerged | Nguyễn Thái Ngọc Duy | 2019-05-07 | 1 | -9/+20 |
| * | | | | | | | | | restore: default to --source=HEAD when only --staged is specified | Nguyễn Thái Ngọc Duy | 2019-05-07 | 1 | -0/+6 |
| * | | | | | | | | | restore: reject invalid combinations with --staged | Nguyễn Thái Ngọc Duy | 2019-05-07 | 1 | -0/+10 |
| * | | | | | | | | | restore: add --worktree and --staged | Nguyễn Thái Ngọc Duy | 2019-05-07 | 1 | -6/+68 |
| * | | | | | | | | | checkout: factor out worktree checkout code | Nguyễn Thái Ngọc Duy | 2019-05-07 | 1 | -49/+59 |
| * | | | | | | | | | restore: disable overlay mode by default | Nguyễn Thái Ngọc Duy | 2019-05-07 | 1 | -4/+7 |