summaryrefslogtreecommitdiff
path: root/contrib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sg/subtree-signed-commits'Junio C Hamano2018-03-081-6/+6
|\
| * subtree: fix add and pull for GPG-signed commitssg/subtree-signed-commitsStephen R Guglielmo2018-02-231-6/+6
* | Merge branch 'bw/perl-timegm-timelocal-fix'Junio C Hamano2018-03-061-1/+1
|\ \
| * | perl: call timegm and timelocal with 4-digit yearbw/perl-timegm-timelocal-fixBernhard M. Wiedemann2018-02-231-1/+1
| |/
* | Merge branch 'bw/c-plus-plus'Junio C Hamano2018-03-061-1/+1
|\ \
| * | object: rename function 'typename' to 'type_name'Brandon Williams2018-02-141-1/+1
| |/
* | Merge branch 'nd/rebase-show-current-patch'Junio C Hamano2018-03-061-4/+4
|\ \
| * | rebase: introduce and use pseudo-ref REBASE_HEADnd/rebase-show-current-patchNguyễn Thái Ngọc Duy2018-02-121-1/+1
| * | rebase: add --show-current-patchNguyễn Thái Ngọc Duy2018-02-121-2/+2
| * | am: add --show-current-patchNguyễn Thái Ngọc Duy2018-02-121-1/+1
| |/
* | Merge branch 'ab/fetch-prune'Junio C Hamano2018-03-061-1/+1
|\ \
| * | fetch: add a --prune-tags option and fetch.pruneTags configÆvar Arnfjörð Bjarmason2018-02-091-1/+1
| |/
* | Merge branch 'nd/am-quit'Junio C Hamano2018-02-281-1/+1
|\ \
| * | am: support --quitnd/am-quitNguyễn Thái Ngọc Duy2018-02-141-1/+1
* | | Merge branch 'rd/typofix'Junio C Hamano2018-02-271-1/+1
|\ \ \
| * | | Correct mispellings of ".gitmodule" to ".gitmodules"rd/typofixRobert P. J. Day2018-02-141-1/+1
| | |/ | |/|
* | | Merge branch 'rs/cocci-strbuf-addf-to-addstr'Junio C Hamano2018-02-151-16/+1
|\ \ \ | |_|/ |/| |
| * | cocci: simplify check for trivial format stringsrs/cocci-strbuf-addf-to-addstrRené Scharfe2018-02-021-16/+1
| |/
* | Merge branch 'nd/list-merge-strategy'Junio C Hamano2018-02-131-1/+1
|\ \
| * | completion: fix completing merge strategies on non-C localesnd/list-merge-strategyDuy Nguyen2018-01-261-1/+1
| |/
* | Merge branch 'rs/strbuf-cocci-workaround'Junio C Hamano2018-02-131-1/+2
|\ \
| * | cocci: use format keyword instead of a literal stringrs/strbuf-cocci-workaroundRené Scharfe2018-01-191-1/+2
| * | Merge branch 'tb/complete-describe' into maintJunio C Hamano2017-10-181-1/+1
| |\ \
| * \ \ Merge branch 'rs/cocci-de-paren-call-params' into maintJunio C Hamano2017-10-181-5/+5
| |\ \ \
* | \ \ \ Merge branch 'ab/simplify-perl-makefile'Junio C Hamano2018-02-131-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Makefile: replace perl/Makefile.PL with simple make rulesÆvar Arnfjörð Bjarmason2017-12-111-1/+1
* | | | | Merge branch 'ra/prompt-eread-fix'Junio C Hamano2017-12-281-3/+4
|\ \ \ \ \
| * | | | | git-prompt: fix reading files with windows line endingsra/prompt-eread-fixRobert Abel2017-12-061-1/+1
| * | | | | git-prompt: make __git_eread intended use explicitRobert Abel2017-12-061-3/+4
| * | | | | Merge branch 'tz/fsf-address-update' into maintJunio C Hamano2017-11-217-16/+9
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'js/wincred-empty-cred' into maintJunio C Hamano2017-11-151-2/+8
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'dk/libsecret-unlock-to-load-fix' into maintJunio C Hamano2017-11-151-1/+1
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge branch 'ac/complete-pull-autostash'Junio C Hamano2017-12-061-0/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | completion: add --autostash and --no-autostash to pullac/complete-pull-autostashAlbert Astals Cid2017-11-221-0/+1
* | | | | | | | | Merge branch 'tz/complete-branch-copy'Junio C Hamano2017-11-271-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | completion: add '--copy' option to 'git branch'tz/complete-branch-copyTodd Zullinger2017-11-171-1/+1
* | | | | | | | | | Merge branch 'rv/sendemail-tocmd-in-config-and-completion'Junio C Hamano2017-11-271-0/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | completion: add git config sendemail.tocmdrv/sendemail-tocmd-in-config-and-completionRasmus Villemoes2017-11-141-0/+1
* | | | | | | | | | | Merge branch 'jc/ignore-cr-at-eol'Junio C Hamano2017-11-271-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | diff: --ignore-cr-at-eoljc/ignore-cr-at-eolJunio C Hamano2017-11-081-1/+1
| * | | | | | | | | | Merge branch 'aw/contrib-subtree-doc-asciidoctor' into maintJunio C Hamano2017-07-101-7/+19
| |\ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | git-jump: give contact instructions in the READMEJeff King2017-11-211-0/+7
* | | | | | | | | | | | contrib/git-jump: allow to configure the grep commandBeat Bolli2017-11-212-2/+8
* | | | | | | | | | | | Merge branch 'tz/fsf-address-update'Junio C Hamano2017-11-157-16/+9
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Replace Free Software Foundation address in license noticesTodd Zullinger2017-11-097-16/+9
* | | | | | | | | | | | Merge branch 'ab/mediawiki-namespace'Junio C Hamano2017-11-151-1/+37
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | remote-mediawiki: show progress while fetching namespacesab/mediawiki-namespaceAntoine Beaupré2017-11-081-0/+1
| * | | | | | | | | | | | remote-mediawiki: process namespaces in orderAntoine Beaupré2017-11-081-1/+1
| * | | | | | | | | | | | remote-mediawiki: support fetching from (Main) namespaceAntoine Beaupré2017-11-081-1/+6
| * | | | | | | | | | | | remote-mediawiki: skip virtual namespacesAntoine Beaupré2017-11-081-1/+4