Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | l10n: reformat some localized strings for v2.23.0 | Jean-Noël Avila | 2019-08-06 | 2 | -5/+12 |
* | Merge branch 'jc/log-mailmap-flip-defaults' | Junio C Hamano | 2019-08-02 | 1 | -19/+2 |
|\ | |||||
| * | log: really flip the --mailmap default | Junio C Hamano | 2019-08-02 | 1 | -5/+2 |
| * | log: flip the --mailmap default unconditionally | Junio C Hamano | 2019-08-01 | 1 | -15/+1 |
* | | Merge branch 'jk/repack-silence-auto-bitmap-warning' | Junio C Hamano | 2019-08-01 | 2 | -22/+23 |
|\ \ | |/ |/| | |||||
| * | repack: simplify handling of auto-bitmaps and .keep files | Jeff King | 2019-07-31 | 1 | -15/+2 |
| * | repack: silence warnings when auto-enabled bitmaps cannot be built | Jeff King | 2019-07-31 | 2 | -11/+25 |
* | | Merge branch 'jk/no-system-includes-in-dot-c' | Junio C Hamano | 2019-07-31 | 2 | -2/+0 |
|\ \ | |/ |/| | |||||
| * | verify-tag: drop signal.h include | Jeff King | 2019-06-19 | 2 | -2/+0 |
* | | Merge branch 'js/rebase-cleanup' | Junio C Hamano | 2019-07-29 | 1 | -5/+1 |
|\ \ | |||||
| * | | git: mark cmd_rebase as requiring a worktree | Johannes Schindelin | 2019-07-25 | 1 | -4/+0 |
| * | | rebase: fix white-space | Johannes Schindelin | 2019-07-25 | 1 | -1/+1 |
| |/ | |||||
* | | Merge branch 'jc/denoise-rm-to-resolve' | Junio C Hamano | 2019-07-25 | 1 | -1/+1 |
|\ \ | |||||
| * | | rm: resolving by removal is not a warning-worthy event | Junio C Hamano | 2019-07-18 | 1 | -1/+1 |
* | | | Merge branch 'js/clean-report-too-long-a-path' | Junio C Hamano | 2019-07-25 | 1 | -1/+2 |
|\ \ \ | |||||
| * | | | clean: show an error message when the path is too long | Johannes Schindelin | 2019-07-19 | 1 | -1/+2 |
| | |/ | |/| | |||||
* | | | Merge branch 'tg/stash-keep-index-with-removed-paths' | Junio C Hamano | 2019-07-25 | 1 | -23/+9 |
|\ \ \ | |||||
| * | | | stash: fix handling removed files with --keep-index | Thomas Gummerer | 2019-07-16 | 1 | -23/+9 |
| |/ / | |||||
* | | | Merge branch 'mt/dir-iterator-updates' | Junio C Hamano | 2019-07-25 | 1 | -32/+43 |
|\ \ \ | |||||
| * | | | clone: replace strcmp by fspathcmp | Matheus Tavares | 2019-07-11 | 1 | -1/+1 |
| * | | | clone: use dir-iterator to avoid explicit dir traversal | Matheus Tavares | 2019-07-11 | 1 | -22/+25 |
| * | | | clone: extract function from copy_or_link_directory | Matheus Tavares | 2019-07-11 | 1 | -8/+16 |
| * | | | clone: copy hidden paths at local clone | Matheus Tavares | 2019-07-11 | 1 | -1/+1 |
| * | | | clone: better handle symlinked files at .git/objects/ | Matheus Tavares | 2019-07-11 | 1 | -1/+1 |
* | | | | Merge branch 'ac/log-use-mailmap-by-default-transition' | Junio C Hamano | 2019-07-25 | 1 | -2/+24 |
|\ \ \ \ | |||||
| * | | | | log: add warning for unspecified log.mailmap setting | Ariadne Conill | 2019-07-15 | 1 | -2/+24 |
* | | | | | 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-19 | 1 | -8/+19 |
| * | | | | | | | | commit-graph: create options for split files | Derrick Stolee | 2019-06-19 | 3 | -7/+23 |
| * | | | | | | | | commit-graph: add --split option to builtin | Derrick Stolee | 2019-06-19 | 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 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | | |