summaryrefslogtreecommitdiff
path: root/contrib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rs/cocci-check-free-only-null'Junio C Hamano2017-02-161-0/+6
|\
| * cocci: detect useless free(3) callsrs/cocci-check-free-only-nullRené Scharfe2017-02-111-0/+6
* | Merge branch 'cw/completion'Junio C Hamano2017-02-151-21/+118
|\ \
| * | completion: recognize more long-optionscw/completionCornelius Weig2017-02-031-9/+20
| * | completion: teach remote subcommands to complete optionsCornelius Weig2017-02-031-7/+38
| * | completion: teach replace to complete optionsCornelius Weig2017-02-031-0/+6
| * | completion: teach ls-remote to complete optionsCornelius Weig2017-02-031-0/+6
| * | completion: improve bash completion for git-addCornelius Weig2017-02-031-3/+7
| * | completion: add subcommand completion for rerereCornelius Weig2017-02-031-0/+11
| * | completion: teach submodule subcommands to complete optionsCornelius Weig2017-02-031-2/+30
* | | Merge branch 'rs/swap'Junio C Hamano2017-02-151-0/+28
|\ \ \
| * | | add SWAP macroRené Scharfe2017-01-301-0/+28
* | | | Merge branch 'ew/complete-svn-authorship-options'Junio C Hamano2017-02-101-2/+2
|\ \ \ \
| * | | | completion: fix git svn authorship switchesew/complete-svn-authorship-optionsEric Wong2017-02-061-2/+2
| | |_|/ | |/| |
| * | | Merge branch 'ls/filter-process' into maintJunio C Hamano2017-01-171-2/+6
| |\ \ \
| * \ \ \ Merge branch 'bb/unicode-9.0' into maintJunio C Hamano2017-01-173-0/+56
| |\ \ \ \
* | \ \ \ \ Merge branch 'bw/push-submodule-only'Junio C Hamano2017-02-101-1/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | completion: add completion for --recurse-submodules=onlybw/push-submodule-onlyCornelius Weig2017-02-011-1/+1
* | | | | | Merge branch 'pl/complete-diff-submodule-diff'Junio C Hamano2017-02-031-1/+1
|\ \ \ \ \ \
| * | | | | | Completion: Add support for --submodule=diffpl/complete-diff-submodule-diffPeter Law2017-01-301-1/+1
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'rs/absolute-pathdup'Junio C Hamano2017-02-021-0/+6
|\ \ \ \ \ \
| * | | | | | abspath: add absolute_pathdup()René Scharfe2017-01-261-0/+6
| * | | | | | Merge branch 'rs/cocci' into maintJunio C Hamano2016-11-291-0/+15
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'cp/completion-negative-refs' into maintJunio C Hamano2016-11-291-3/+4
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge branch 'js/difftool-builtin'Junio C Hamano2017-01-311-0/+481
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | difftool: retire the scripted versionJohannes Schindelin2017-01-191-0/+470
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'sb/retire-convert-objects-from-contrib'Junio C Hamano2017-01-312-358/+0
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | contrib: remove git-convert-objectssb/retire-convert-objects-from-contribStefan Beller2017-01-192-358/+0
* | | | | | | | | Merge branch 'sb/remove-gitview'Junio C Hamano2017-01-182-1362/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | contrib: remove gitviewStefan Beller2017-01-072-1362/+0
* | | | | | | | | Merge branch 'ls/filter-process'Junio C Hamano2016-12-271-2/+6
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | docs: warn about possible '=' in clean/smudge filter process valuesLars Schneider2016-12-061-2/+6
* | | | | | | | | Merge branch 'cp/merge-continue'Junio C Hamano2016-12-271-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | completion: add --continue option for mergeChris Packham2016-12-141-1/+1
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'bb/unicode-9.0'Junio C Hamano2016-12-193-0/+56
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | update_unicode.sh: remove the plane filterBeat Bolli2016-12-141-2/+1
| * | | | | | | update_unicode.sh: automatically download newer definition filesBeat Bolli2016-12-141-6/+2
| * | | | | | | update_unicode.sh: pin the uniset repo to a known good commitBeat Bolli2016-12-131-1/+2
| * | | | | | | update_unicode.sh: remove an unnecessary subshell levelBeat Bolli2016-12-131-27/+26
| * | | | | | | update_unicode.sh: move it into contrib/update-unicodeBeat Bolli2016-12-133-0/+61
* | | | | | | | Merge branch 'nd/rebase-forget'Junio C Hamano2016-12-191-2/+2
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | rebase: add --quit to cleanup rebase, leave everything else untouchednd/rebase-forgetNguyễn Thái Ngọc Duy2016-12-111-2/+2
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'rs/cocci'Junio C Hamano2016-11-011-0/+15
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | cocci: avoid self-references in object_id transformationsrs/cocciRené Scharfe2016-11-011-0/+15
| | |_|_|/ / | |/| | | |
| * | | | | Merge branch 'jc/cocci-xstrdup-or-null' into maintJunio C Hamano2016-10-281-0/+7
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'rs/cocci' into maintJunio C Hamano2016-10-284-6/+52
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge branch 'ls/filter-process'Junio C Hamano2016-10-311-0/+128
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | contrib/long-running-filter: add long running filter exampleLars Schneider2016-10-171-0/+128
* | | | | | | | Merge branch 'jc/cocci-xstrdup-or-null'Junio C Hamano2016-10-261-0/+7
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | cocci: refactor common patterns to use xstrdup_or_null()jc/cocci-xstrdup-or-nullJunio C Hamano2016-10-121-0/+7
| | |/ / / / / | |/| | | | |
View Lorry Controller Status