summaryrefslogtreecommitdiff
path: root/contrib
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | | | remote-mediawiki: show known namespace choices on failureAntoine Beaupré2017-11-081-1/+2
| * | | | | | remote-mediawiki: allow fetching namespaces with spacesIngo Ruhnke2017-11-071-0/+1
| * | | | | | remote-mediawiki: add namespace supportKevin2017-11-071-0/+25
| |/ / / / /
* | | | | | Merge branch 'ab/mediawiki-name-truncation'Junio C Hamano2017-11-151-1/+2
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | remote-mediawiki: limit filenames to legalab/mediawiki-name-truncationAntoine Beaupré2017-11-011-1/+2
| |/ / / /
* | | | | Merge branch 'js/wincred-empty-cred'Junio C Hamano2017-11-091-2/+8
|\ \ \ \ \
| * | | | | wincred: handle empty username/password correctlyjs/wincred-empty-credJakub Bereżański2017-11-011-2/+8
| |/ / / /
* | | | | Merge branch 'dk/libsecret-unlock-to-load-fix'Junio C Hamano2017-11-091-1/+1
|\ \ \ \ \
| * | | | | credential-libsecret: unlock locked secretsdk/libsecret-unlock-to-load-fixDennis Kaarsemaker2017-11-041-1/+1
* | | | | | Merge branch 'tb/complete-checkout'Junio C Hamano2017-11-061-1/+2
|\ \ \ \ \ \
| * | | | | | completion: add remaining flags to checkouttb/complete-checkoutThomas Braun2017-10-251-1/+2
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'dm/run-command-ignored-hook-advise'Junio C Hamano2017-11-061-0/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | run-command: add hint when a hook is ignoreddm/run-command-ignored-hook-adviseDamien Marié2017-10-101-0/+1
* | | | | | Merge branch 'tb/complete-describe'Junio C Hamano2017-10-111-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | completion: add --broken and --dirty to describetb/complete-describeThomas Braun2017-10-071-1/+1
* | | | | | Merge branch 'rs/cocci-de-paren-call-params'Junio C Hamano2017-10-051-5/+5
|\ \ \ \ \ \
| * | | | | | coccinelle: remove parentheses that become unnecessaryrs/cocci-de-paren-call-paramsRené Scharfe2017-10-021-5/+5
| |/ / / / /
* | | | | | Merge branch 'dw/diff-highlight-makefile-fix'Junio C Hamano2017-09-191-0/+3
|\ \ \ \ \ \
| * | | | | | diff-highlight: add clean target to Makefiledw/diff-highlight-makefile-fixDaniel Watkins2017-09-061-0/+3
| |/ / / / /
* | | | | | Merge branch 'ma/up-to-date'Junio C Hamano2017-09-103-4/+4
|\ \ \ \ \ \
| * | | | | | treewide: correct several "up-to-date" to "up to date"ma/up-to-dateMartin Ågren2017-08-233-4/+4
* | | | | | | Merge branch 'eb/contacts-reported-by'Junio C Hamano2017-08-111-1/+1
|\ \ \ \ \ \ \
| * | | | | | | git-contacts: also recognise "Reported-by:"eb/contacts-reported-byEric Blake2017-07-271-1/+1
| |/ / / / / /
* | | | | | | Merge branch 'rg/rerere-train-overwrite'Junio C Hamano2017-08-111-2/+52
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | contrib/rerere-train: optionally overwrite existing resolutionsrg/rerere-train-overwriteRaman Gupta2017-07-261-2/+52
| |/ / / / /
* | | | | | add MOVE_ARRAYRené Scharfe2017-07-171-0/+17
|/ / / / /
* | | | | Merge branch 'rs/free-and-null'Junio C Hamano2017-07-101-9/+1
|\ \ \ \ \
| * | | | | coccinelle: polish FREE_AND_NULL rulesrs/free-and-nullRené Scharfe2017-06-291-9/+1
* | | | | | Merge branch 'xz/send-email-batch-size'Junio C Hamano2017-07-061-0/+2
|\ \ \ \ \ \
| * | | | | | send-email: --batch-size to work around some SMTP server limitxiaoqiang zhao2017-07-051-0/+2
* | | | | | | Merge branch 'aw/contrib-subtree-doc-asciidoctor'Junio C Hamano2017-07-061-7/+19
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | subtree: honour USE_ASCIIDOCTOR when setaw/contrib-subtree-doc-asciidoctorA. Wilcox2017-06-271-7/+19