summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge https://github.com/prati0100/git-guiJunio C Hamano2021-03-013-3/+22
|\
| * Merge branch 'py/commit-comments'Pratyush Yadav2021-02-222-2/+21
| |\
| | * git-gui: remove lines starting with the comment characterPratyush Yadav2021-02-182-2/+21
| |/
| * Merge branch 'mk/russian-translation'Pratyush Yadav2021-02-021-1/+1
| |\
| | * git-gui: fix typo in russian localeMikhail Klyushin2021-02-021-1/+1
| |/
* | Merge branch 'js/commit-graph-warning'Junio C Hamano2021-03-011-11/+3
|\ \
| * | Revert "commit-graph: when incompatible with graphs, indicate why"Junio C Hamano2021-03-011-11/+3
* | | Git 2.31-rc0v2.31.0-rc0Junio C Hamano2021-02-262-1/+50
* | | Merge branch 'jc/push-delete-nothing'Junio C Hamano2021-02-262-1/+6
|\ \ \
| * | | push: do not turn --delete '' into a matching pushJunio C Hamano2021-02-242-1/+6
* | | | Merge branch 'sh/mergetools-vimdiff1'Junio C Hamano2021-02-261-1/+12
|\ \ \ \
| * | | | mergetools/vimdiff: add vimdiff1 merge tool variantSeth House2021-02-231-1/+12
* | | | | Merge branch 'dl/doc-config-camelcase'Junio C Hamano2021-02-265-7/+7
|\ \ \ \ \
| * | | | | index-format doc: camelCase core.excludesFileJunio C Hamano2021-02-251-2/+2
| * | | | | blame-options.txt: camelcase blame.blankBoundaryJunio C Hamano2021-02-251-1/+1
| * | | | | i18n.txt: camel case and monospace "i18n.commitEncoding"Denton Liu2021-02-253-4/+4
* | | | | | Merge branch 'js/params-vs-args'Junio C Hamano2021-02-266-18/+18
|\ \ \ \ \ \
| * | | | | | replace "parameters" by "arguments" in error messagesJohannes Sixt2021-02-236-18/+18
| |/ / / / /
* | | | | | Merge branch 'ug/doc-commit-approxidate'Junio C Hamano2021-02-261-4/+7
|\ \ \ \ \ \
| * | | | | | doc: mention approxidates for git-commit --dateJeff King2021-02-231-4/+7
| |/ / / / /
* | | | | | Merge branch 'es/maintenance-of-bare-repositories'Junio C Hamano2021-02-262-17/+46
|\ \ \ \ \ \
| * | | | | | maintenance: fix incorrect `maintenance.repo` path with bare repositoryEric Sunshine2021-02-232-17/+46
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'mt/add-chmod-fixes'Junio C Hamano2021-02-262-10/+54
|\ \ \ \ \ \
| * | | | | | add: propagate --chmod errors to exit statusMatheus Tavares2021-02-242-10/+28
| * | | | | | add: mark --chmod error string for translationMatheus Tavares2021-02-242-2/+2
| * | | | | | add --chmod: don't update index when --dry-run is usedMatheus Tavares2021-02-242-3/+29
| |/ / / / /
* | | | | | Merge branch 'ds/merge-base-independent'Junio C Hamano2021-02-261-25/+165
|\ \ \ \ \ \
| * | | | | | commit-reach: stale commits may prune generation furtherDerrick Stolee2021-02-221-7/+21
| * | | | | | commit-reach: use heuristic in remove_redundant()Derrick Stolee2021-02-221-16/+56
| * | | | | | commit-reach: move compare_commits_by_genDerrick Stolee2021-02-221-15/+15
| * | | | | | commit-reach: use one walk in remove_redundant()Derrick Stolee2021-02-221-8/+96
| * | | | | | commit-reach: reduce requirements for remove_redundant()Derrick Stolee2021-02-011-6/+4
* | | | | | | Merge branch 'ah/rebase-no-fork-point-config'Junio C Hamano2021-02-263-17/+61
|\ \ \ \ \ \ \
| * | | | | | | rebase: add a config option for --no-fork-pointAlex Henrie2021-02-243-17/+61
* | | | | | | | Merge branch 'mt/grep-sparse-checkout'Junio C Hamano2021-02-263-11/+179
|\ \ \ \ \ \ \ \
| * | | | | | | | grep: honor sparse-checkout on working tree searchesMatheus Tavares2021-02-103-11/+179
* | | | | | | | | Merge branch 'ah/commit-graph-leakplug'Junio C Hamano2021-02-261-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | commit-graph: avoid leaking topo_levels slab in write_commit_graph()Andrzej Hunt2021-02-221-0/+1
* | | | | | | | | | Merge branch 'zh/difftool-skip-to'Junio C Hamano2021-02-262-0/+40
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | difftool.c: learn a new way start at specified fileZheNing Hu2021-02-222-0/+40
* | | | | | | | | | | Merge branch 'cw/pack-config-doc'Junio C Hamano2021-02-262-1/+19
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | doc: mention bigFileThreshold for packingChristian Walther2021-02-222-1/+19
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jc/maint-column-doc-typofix'Junio C Hamano2021-02-263-3/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Documentation: typofix --column descriptionJunio C Hamano2021-02-203-3/+3
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'ma/doc-markup-fix'Junio C Hamano2021-02-263-8/+8
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | gitmailmap.txt: fix rendering of e-mail addressesMartin Ågren2021-02-181-4/+4
| * | | | | | | | | | | git.txt: fix monospace renderingMartin Ågren2021-02-181-1/+1
| * | | | | | | | | | | rev-list-options.txt: fix rendering of bonus paragraphMartin Ågren2021-02-171-3/+3
* | | | | | | | | | | | Merge branch 'jc/diffcore-rotate'Junio C Hamano2021-02-2612-1/+197
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | diff: --{rotate,skip}-to=<path>Junio C Hamano2021-02-1612-1/+197