aboutsummaryrefslogtreecommitdiff
path: root/contrib
Commit message (Expand)AuthorAge
* Merge branch 'rs/strbuf-add-real-path' into maintJunio C Hamano2017-03-28
|\
| * strbuf: add strbuf_add_real_path()René Scharfe2017-02-27
| * cocci: use ALLOC_ARRAYRené Scharfe2017-02-27
* | contrib: git-remote-{bzr,hg} placeholders don't need PythonSebastian Schuberth2017-03-03
* | Merge branch 'rs/cocci-check-free-only-null'Junio C Hamano2017-02-16
|\ \
| * | cocci: detect useless free(3) callsRené Scharfe2017-02-11
| |/
* | Merge branch 'cw/completion'Junio C Hamano2017-02-15
|\ \
| * | completion: recognize more long-optionsCornelius Weig2017-02-03
| * | completion: teach remote subcommands to complete optionsCornelius Weig2017-02-03
| * | completion: teach replace to complete optionsCornelius Weig2017-02-03
| * | completion: teach ls-remote to complete optionsCornelius Weig2017-02-03
| * | completion: improve bash completion for git-addCornelius Weig2017-02-03
| * | completion: add subcommand completion for rerereCornelius Weig2017-02-03
| * | completion: teach submodule subcommands to complete optionsCornelius Weig2017-02-03
* | | Merge branch 'rs/swap'Junio C Hamano2017-02-15
|\ \ \
| * | | add SWAP macroRené Scharfe2017-01-30
* | | | Merge branch 'ew/complete-svn-authorship-options'Junio C Hamano2017-02-10
|\ \ \ \
| * | | | completion: fix git svn authorship switchesEric Wong2017-02-06
| | |_|/ | |/| |
| * | | Merge branch 'ls/filter-process' into maintJunio C Hamano2017-01-17
| |\ \ \
| * \ \ \ Merge branch 'bb/unicode-9.0' into maintJunio C Hamano2017-01-17
| |\ \ \ \
* | \ \ \ \ Merge branch 'bw/push-submodule-only'Junio C Hamano2017-02-10
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | completion: add completion for --recurse-submodules=onlyCornelius Weig2017-02-01
* | | | | | Merge branch 'pl/complete-diff-submodule-diff'Junio C Hamano2017-02-03
|\ \ \ \ \ \
| * | | | | | Completion: Add support for --submodule=diffPeter Law2017-01-30
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'rs/absolute-pathdup'Junio C Hamano2017-02-02
|\ \ \ \ \ \
| * | | | | | abspath: add absolute_pathdup()René Scharfe2017-01-26
| * | | | | | Merge branch 'rs/cocci' into maintJunio C Hamano2016-11-29
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'cp/completion-negative-refs' into maintJunio C Hamano2016-11-29
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge branch 'js/difftool-builtin'Junio C Hamano2017-01-31
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | difftool: retire the scripted versionJohannes Schindelin2017-01-19
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'sb/retire-convert-objects-from-contrib'Junio C Hamano2017-01-31
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | contrib: remove git-convert-objectsStefan Beller2017-01-19
* | | | | | | | | Merge branch 'sb/remove-gitview'Junio C Hamano2017-01-18
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | contrib: remove gitviewStefan Beller2017-01-07
* | | | | | | | | Merge branch 'ls/filter-process'Junio C Hamano2016-12-27
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | docs: warn about possible '=' in clean/smudge filter process valuesLars Schneider2016-12-06
* | | | | | | | | Merge branch 'cp/merge-continue'Junio C Hamano2016-12-27
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | completion: add --continue option for mergeChris Packham2016-12-14
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'bb/unicode-9.0'Junio C Hamano2016-12-19
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | update_unicode.sh: remove the plane filterBeat Bolli2016-12-14
| * | | | | | | update_unicode.sh: automatically download newer definition filesBeat Bolli2016-12-14
| * | | | | | | update_unicode.sh: pin the uniset repo to a known good commitBeat Bolli2016-12-13
| * | | | | | | update_unicode.sh: remove an unnecessary subshell levelBeat Bolli2016-12-13
| * | | | | | | update_unicode.sh: move it into contrib/update-unicodeBeat Bolli2016-12-13
* | | | | | | | Merge branch 'nd/rebase-forget'Junio C Hamano2016-12-19
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | rebase: add --quit to cleanup rebase, leave everything else untouchedNguyễn Thái Ngọc Duy2016-12-11
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'rs/cocci'Junio C Hamano2016-11-01
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | cocci: avoid self-references in object_id transformationsRené Scharfe2016-11-01
| | |_|_|/ / | |/| | | |
| * | | | | Merge branch 'jc/cocci-xstrdup-or-null' into maintJunio C Hamano2016-10-28
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'rs/cocci' into maintJunio C Hamano2016-10-28
| |\ \ \ \ \ \