summaryrefslogtreecommitdiff
path: root/contrib
Commit message (Expand)AuthorAgeFilesLines
* 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
| | |/ / / / | |/| | | |
| * | | | | Merge branch 'rs/copy-array' into maintJunio C Hamano2016-10-111-0/+26
| |\ \ \ \ \ | | |/ / / / | |/| | | |
* | | | | | Merge branch 'mm/credential-libsecret'Junio C Hamano2016-10-262-0/+395
|\ \ \ \ \ \
| * | | | | | contrib: add credential helper for libsecretmm/credential-libsecretMantas Mikulėnas2016-10-112-0/+395
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'rs/cocci'Junio C Hamano2016-10-171-0/+5
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | remove unnecessary NULL check before free(3)René Scharfe2016-10-101-0/+5
* | | | | | Merge branch 'cp/completion-negative-refs'Junio C Hamano2016-10-101-3/+4
|\ \ \ \ \ \
| * | | | | | completion: support excluding refscp/completion-negative-refsChris Packham2016-08-241-3/+4
| * | | | | | Merge branch 'cp/completion-clone-recurse-submodules' into maintJunio C Hamano2016-08-101-0/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'pm/build-persistent-https-with-recent-go' into maintJunio C Hamano2016-08-101-2/+4
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'da/subtree-2.9-regression' into maintJunio C Hamano2016-08-102-8/+25
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge branch 'rs/qsort'Junio C Hamano2016-10-101-0/+37
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | remove unnecessary check before QSORTRené Scharfe2016-09-291-0/+18
| * | | | | | | | | | add QSORTRené Scharfe2016-09-291-0/+19
* | | | | | | | | | | Merge branch 'rs/cocci'Junio C Hamano2016-10-062-1/+37
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | |
| * | | | | | | | | | coccicheck: make transformation for strbuf_addf(sb, "...") more preciseRené Scharfe2016-10-031-3/+26
| * | | | | | | | | | use strbuf_add_unique_abbrev() for adding short hashes, part 2René Scharfe2016-09-271-0/+6
| * | | | | | | | | | use strbuf_addstr() instead of strbuf_addf() with "%s", part 2René Scharfe2016-09-271-0/+6
| * | | | | | | | | | gitignore: ignore output files of coccicheck make targetRené Scharfe2016-09-271-0/+1
* | | | | | | | | | | Merge branch 'rs/copy-array'Junio C Hamano2016-10-031-0/+26
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | / / | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| * | | | | | | | | use COPY_ARRAYrs/copy-arrayRené Scharfe2016-09-251-0/+26
* | | | | | | | | | Merge branch 'rs/cocci'Junio C Hamano2016-09-262-6/+11
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | / / | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | use strbuf_addstr() for adding constant strings to a strbuf, part 2René Scharfe2016-09-151-0/+5
| * | | | | | | | contrib/coccinelle: fix semantic patch for oid_to_hex_r()René Scharfe2016-09-151-6/+6
* | | | | | | | | diff-highlight: avoid highlighting combined diffsbh/diff-highlight-graphJeff King2016-08-312-1/+38
* | | | | | | | | diff-highlight: add multi-byte testsJeff King2016-08-311-1/+35
* | | | | | | | | diff-highlight: ignore test cruftJeff King2016-08-311-0/+2
* | | | | | | | | diff-highlight: add support for --graph outputBrian Henderson2016-08-292-7/+14
* | | | | | | | | diff-highlight: add failing test for handling --graph outputBrian Henderson2016-08-291-0/+62
View Lorry Controller Status