summaryrefslogtreecommitdiff
path: root/contrib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ab/cred-netrc-no-autodie'Junio C Hamano2018-06-181-1/+0
|\
| * git-credential-netrc: remove use of "autodie"Ævar Arnfjörð Bjarmason2018-06-131-1/+0
* | Merge branch 'sg/completion-zsh-workaround'Junio C Hamano2018-06-132-2/+5
|\ \
| * | completion: correct zsh detection when run from git-completion.zshSZEDER Gábor2018-06-122-2/+5
* | | Merge branch 'pa/import-tars-long-names'Junio C Hamano2018-06-011-2/+29
|\ \ \
| * | | import-tars: read overlong names from pax extended headerPedro Alvarez Piedehierro2018-05-241-2/+29
* | | | Merge branch 'nd/command-list'Junio C Hamano2018-06-011-132/+16
|\ \ \ \
| * | | | completion: allow to customize the completable command listNguyễn Thái Ngọc Duy2018-05-211-1/+1
| * | | | completion: add and use --list-cmds=aliasNguyễn Thái Ngọc Duy2018-05-211-60/+15
| * | | | completion: add and use --list-cmds=nohelpersNguyễn Thái Ngọc Duy2018-05-211-16/+4
| * | | | completion: let git provide the completable command listNguyễn Thái Ngọc Duy2018-05-211-91/+28
| * | | | help: use command-list.txt for the source of guidesNguyễn Thái Ngọc Duy2018-05-211-5/+10
| * | | | completion: implement and use --list-cmds=main,othersNguyễn Thái Ngọc Duy2018-05-211-1/+1
| * | | | git.c: convert --list-* to --list-cmds=*Nguyễn Thái Ngọc Duy2018-05-211-1/+1
* | | | | Merge branch 'lm/credential-netrc'Junio C Hamano2018-05-307-50/+135
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | git-credential-netrc: accept gpg optionLuis Marsano2018-05-146-24/+62
| * | | | git-credential-netrc: adapt to test framework for gitLuis Marsano2018-05-143-30/+77
| | |/ / | |/| |
* | | | Merge branch 'sg/complete-paths'Junio C Hamano2018-05-302-26/+200
|\ \ \ \
| * | | | completion: don't return with error from __gitcomp_file_direct()SZEDER Gábor2018-05-211-2/+4
| * | | | completion: fill COMPREPLY directly when completing pathsSZEDER Gábor2018-04-172-4/+39
| * | | | completion: improve handling quoted paths in 'git ls-files's outputSZEDER Gábor2018-04-171-2/+64
| * | | | completion: remove repeated dirnames with 'awk' during path completionSZEDER Gábor2018-04-171-2/+6
| * | | | completion: use 'awk' to strip trailing path componentsSZEDER Gábor2018-04-171-7/+4
| * | | | completion: let 'ls-files' and 'diff-index' filter matching pathsSZEDER Gábor2018-04-171-5/+6
| * | | | completion: improve handling quoted paths on the command lineSZEDER Gábor2018-04-171-4/+72
| * | | | completion: support completing non-ASCII pathnamesSZEDER Gábor2018-04-171-2/+4
| * | | | completion: simplify prefix path component handling during path completionSZEDER Gábor2018-04-171-4/+3
| * | | | completion: move __git_complete_index_file() next to its helpersSZEDER Gábor2018-04-171-20/+19
| | |/ / | |/| |
* | | | Merge branch 'fg/completion-external'Junio C Hamano2018-05-231-2/+9
|\ \ \ \
| * | | | completion: load completion file for external subcommandFlorian Gamböck2018-05-071-0/+10
| | |/ / | |/| |
* | | | Merge branch 'nd/completion-aliasfiletype-typofix'Junio C Hamano2018-05-231-1/+1
|\ \ \ \
| * | | | completion: fix misspelled config key aliasesfiletypeNguyễn Thái Ngọc Duy2018-05-061-1/+1
| |/ / /
* | | | Merge branch 'js/rebase-recreate-merge'Junio C Hamano2018-05-231-2/+2
|\ \ \ \
| * | | | pull: accept --rebase=merges to recreate the branch topologyJohannes Schindelin2018-04-261-1/+1
| * | | | rebase: introduce the --rebase-merges optionJohannes Schindelin2018-04-261-1/+1
* | | | | Merge branch 'js/deprecate-grafts'Junio C Hamano2018-05-231-28/+0
|\ \ \ \ \
| * | | | | Remove obsolete script to convert grafts to replace refsJohannes Schindelin2018-04-301-28/+0
| |/ / / /
* | | | | Merge branch 'ds/lazy-load-trees'Junio C Hamano2018-05-231-0/+28
|\ \ \ \ \
| * | | | | coccinelle: avoid wrong transformation suggestions from commit.cocciSZEDER Gábor2018-05-021-6/+4
| * | | | | treewide: replace maybe_tree with accessor methodsDerrick Stolee2018-04-111-0/+30
| * | | | | Merge branch 'bw/c-plus-plus' into ds/lazy-load-treesJunio C Hamano2018-04-111-1/+1
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'tg/demote-stash-save-in-completion'Junio C Hamano2018-05-081-2/+10
|\ \ \ \ \ \ \
| * | | | | | | completion: make stash -p and alias for stash push -pThomas Gummerer2018-04-201-0/+3
| * | | | | | | completion: stop showing 'save' for stash by defaultThomas Gummerer2018-04-201-2/+7
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'sg/completion-clear-cached'Junio C Hamano2018-05-081-1/+5
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | completion: reduce overhead of clearing cached --optionsSZEDER Gábor2018-04-181-1/+5
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'ab/nuke-emacs-contrib'Junio C Hamano2018-05-085-2228/+25
|\ \ \ \ \ \
| * | | | | | git{,-blame}.el: remove old bitrotting Emacs codeÆvar Arnfjörð Bjarmason2018-04-165-2228/+25
* | | | | | | Merge branch 'ds/commit-graph'Junio C Hamano2018-05-081-0/+2
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | commit-graph: create git-commit-graph builtinDerrick Stolee2018-04-021-0/+2
View Lorry Controller Status