summaryrefslogtreecommitdiff
path: root/contrib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/slimmed-down'Junio C Hamano2020-09-036-312/+6
|\
| * drop vcs-svn experimentJeff King2020-08-136-287/+5
| * make git-fast-import a builtinJeff King2020-08-131-4/+1
| * make git-bugreport a builtinJeff King2020-08-131-4/+1
| * make credential helpers builtinsJeff King2020-08-131-19/+1
* | Merge branch 'rz/complete-more-options'Junio C Hamano2020-08-271-1/+13
|\ \
| * | completion: add GIT_COMPLETION_SHOW_ALL env varRyan Zoeller2020-08-191-1/+13
* | | Merge branch 'dl/subtree-docs'Junio C Hamano2020-08-241-3/+3
|\ \ \ | |/ / |/| |
| * | contrib/subtree: document 'push' does not take '--squash'Danny Lin2020-08-181-2/+2
| * | contrib/subtree: fix "unsure" for --message in the documentDanny Lin2020-08-181-1/+1
* | | Merge branch 'pd/mergetool-nvimdiff'Junio C Hamano2020-08-171-2/+2
|\ \ \ | |_|/ |/| |
| * | mergetools: add support for nvimdiff (neovim) familypudinha2020-07-291-2/+2
| |/
* | Merge branch 'ss/cmake-build'Junio C Hamano2020-08-111-0/+1000
|\ \
| * | cmake: support for building git on windows with msvc and clang.Sibi Siddharthan2020-06-261-10/+45
| * | cmake: support for building git on windows with mingwSibi Siddharthan2020-06-261-23/+94
| * | cmake: support for testing git when building out of the source treeSibi Siddharthan2020-06-261-0/+20
| * | cmake: support for testing git with ctestSibi Siddharthan2020-06-261-0/+124
| * | cmake: installation support for gitSibi Siddharthan2020-06-261-0/+49
| * | cmake: generate the shell/perl/python scripts and templates, translationsSibi Siddharthan2020-06-261-1/+110
| * | Introduce CMake support for configuring GitSibi Siddharthan2020-06-121-0/+592
* | | Merge branch 'es/adjust-subtree-test-for-merge-msg-update'Junio C Hamano2020-08-101-4/+2
|\ \ \
| * | | Revert "contrib: subtree: adjust test to change in fmt-merge-msg"Emily Shaffer2020-08-031-4/+2
| | |/ | |/|
* | | Merge branch 'mp/complete-show-color-moved'Junio C Hamano2020-08-041-0/+8
|\ \ \ | |/ / |/| |
| * | completion: add show --color-moved[-ws]Michal Privoznik2020-07-151-0/+8
* | | Merge branch 'en/sparse-status' into masterJunio C Hamano2020-07-211-2/+2
|\ \ \ | |/ / |/| |
| * | git-prompt: change == to = for zsh's sakeDavid J. Malan2020-07-201-2/+2
* | | Merge branch 'vs/completion-with-set-u' into masterJunio C Hamano2020-07-091-9/+9
|\ \ \
| * | | completion: nounset mode fixesVille Skyttä2020-07-011-9/+9
* | | | Merge branch 'js/default-branch-name'Junio C Hamano2020-07-061-2/+4
|\ \ \ \
| * | | | contrib: subtree: adjust test to change in fmt-merge-msgĐoàn Trần Công Danh2020-06-301-2/+4
| | |_|/ | |/| |
* | | | Merge branch 'ak/commit-graph-to-slab'Junio C Hamano2020-07-061-0/+18
|\ \ \ \
| * | | | commit: move members graph_pos, generation to a slabAbhishek Kumar2020-06-171-0/+18
| |/ / /
* | | | Merge branch 'en/sparse-status'Junio C Hamano2020-07-061-2/+24
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | git-prompt: include sparsity state as wellElijah Newren2020-06-221-2/+20
| * | git-prompt: document how in-progress operations affect the promptElijah Newren2020-06-221-0/+4
| |/
* | Merge branch 'jk/complete-git-switch'Junio C Hamano2020-06-251-39/+213
|\ \ | |/ |/|
| * completion: improve handling of --orphan option of switch/checkoutJacob Keller2020-05-281-7/+14
| * completion: improve handling of -c/-C and -b/-B in switch/checkoutJacob Keller2020-05-281-2/+47
| * completion: improve handling of --track in switch/checkoutJacob Keller2020-05-281-2/+22
| * completion: improve handling of --detach in checkoutJacob Keller2020-05-281-1/+6
| * completion: improve completion for git switch with no optionsJacob Keller2020-05-281-13/+20
| * completion: improve handling of DWIM mode for switch/checkoutJacob Keller2020-05-281-19/+76
| * completion: perform DWIM logic directly in __git_complete_refsJacob Keller2020-05-281-1/+18
| * completion: extract function __git_dwim_remote_headsJacob Keller2020-05-281-7/+21
| * completion: replace overloaded track term for __git_complete_refsJacob Keller2020-05-281-13/+15
* | Merge branch 'vs/complete-stash-show-p-fix'Junio C Hamano2020-06-081-1/+1
|\ \
| * | completion: don't override given stash subcommand with -pVille Skyttä2020-05-211-1/+1
* | | completion: use native ZSH array pattern matchingMarco Trevisan (Treviño)2020-05-281-1/+1
* | | Merge branch 'ds/bloom-cleanup'Junio C Hamano2020-05-141-0/+1
|\ \ \
| * | | completion: offer '--(no-)patch' among 'git log' optionsSZEDER Gábor2020-05-111-0/+1