summaryrefslogtreecommitdiff
path: root/contrib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'mm/mediawiki-as-a-remote'Junio C Hamano2011-10-052-0/+830
|\
| * git-remote-mediawiki: allow a domain to be set for authenticationMatthieu Moy2011-09-281-0/+3
| * git-remote-mediawiki: obey advice.pushNonFastForwardMatthieu Moy2011-09-271-7/+10
| * git-remote-mediawiki: set 'basetimestamp' to let the wiki handle conflictsMatthieu Moy2011-09-271-6/+37
| * git-remote-mediawiki: trivial fixesMatthieu Moy2011-09-271-2/+1
| * git-remote-mediawiki: allow push to set MediaWiki metadataMatthieu Moy2011-09-011-2/+33
| * Add a remote helper to interact with mediawiki (fetch & push)Jeremie Nikaes2011-09-012-0/+763
* | contrib/hooks: adapt comment about Debian install location for contrib hooksGerrit Pape2011-09-261-2/+2
* | Merge branch 'va/p4-branch-import'Junio C Hamano2011-08-282-9/+84
|\ \ | |/ |/|
| * git-p4: Allow branch definition with git configVitor Antunes2011-08-222-0/+31
| * git-p4: Allow filtering Perforce branches by userVitor Antunes2011-08-222-1/+13
| * git-p4: Correct branch base depot path detectionVitor Antunes2011-08-221-3/+5
| * git-p4: Process detectCopiesHarder with --boolVitor Antunes2011-08-221-1/+1
| * git-p4: Add description of rename/copy detection optionsVitor Antunes2011-08-221-0/+25
| * git-p4: Allow setting rename/copy detection thresholdVitor Antunes2011-08-221-4/+9
* | Merge branch 'js/ref-namespaces'Junio C Hamano2011-08-171-1/+2
|\ \
| * | ref namespaces: documentationJosh Triplett2011-07-111-1/+1
| * | ref namespaces: infrastructureJosh Triplett2011-07-061-0/+1
* | | Add option hooks.diffopts to customize change summary in post-receive-emailJon Jensen2011-08-041-1/+8
| |/ |/|
* | git-p4: commit time should be most recent p4 change timePete Wyckoff2011-08-011-1/+14
* | Documentation: use [verse] for SYNOPSIS sectionsMartin von Zweigbergk2011-07-063-0/+3
* | Merge branch 'maint'Junio C Hamano2011-06-261-1/+1
|\ \
| * \ Merge branch 'maint-1.7.4' into maintJunio C Hamano2011-06-241-1/+1
| |\ \
| | * | completion: replace core.abbrevguard to core.abbrevNamhyung Kim2011-06-241-1/+1
* | | | Merge branch 'mk/grep-pcre'Junio C Hamano2011-05-301-1/+2
|\ \ \ \ | |_|_|/ |/| | |
| * | | git-grep: Learn PCREMichał Kiedrowicz2011-05-091-0/+1
| * | | contrib/completion: --line-number to git grepMichał Kiedrowicz2011-05-051-1/+1
* | | | Merge branch 'ld/p4-preserve-user-names'Junio C Hamano2011-05-192-38/+215
|\ \ \ \
| * | | | git-p4: warn if git authorship won't be retainedLuke Diamand2011-05-132-2/+38
| * | | | git-p4: small improvements to user-preservationLuke Diamand2011-05-091-5/+14
| * | | | git-p4: add option to preserve user namesLuke Diamand2011-04-262-38/+170
| |/ / /
* | | | Merge branch 'sg/completion-updates'Junio C Hamano2011-05-161-4/+16
|\ \ \ \
| * \ \ \ Merge branch 'fc/completion-zsh' into sg/completion-updatesJunio C Hamano2011-05-101-0/+8
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | git-completion: fix regression in zsh supportFelipe Contreras2011-05-101-0/+8
| | |/ /
| * | | Revert "completion: don't declare 'local words' to make zsh happy"Junio C Hamano2011-05-101-6/+2
| * | | completion: move private shopt shim for zsh to __git_ namespaceJonathan Nieder2011-05-081-4/+8
| * | | completion: don't declare 'local words' to make zsh happySZEDER Gábor2011-04-281-2/+6
* | | | Merge branch 'sg/completion-cleanup'Junio C Hamano2011-05-061-161/+60
|\ \ \ \ | |/ / /
| * | | completion: remove unnecessary _get_comp_words_by_ref() invocationsSZEDER Gábor2011-04-281-105/+11
| * | | completion: don't modify the $cur variable in completion functionsSZEDER Gábor2011-04-281-57/+50
* | | | Merge branch 'jk/notes-ui-updates'Junio C Hamano2011-05-021-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | contrib/completion: --notes, --no-notesMichael J Gruber2011-04-141-1/+1
* | | | Automatically autoload bashcompinit for ZSH, when neededMarius Storm-Olsen2011-04-271-8/+8
| |/ / |/| |
* | | git-p4: replace each tab with 8 spaces for consistencyAndrew Garber2011-04-071-32/+32
* | | git.el: Don't use font-lock-compile-keywordsLawrence Mitchell2011-04-031-3/+10
* | | Merge branch 'maint'Junio C Hamano2011-03-301-2/+2
|\ \ \ | |/ / |/| / | |/
| * contrib/thunderbird-patch-inline: do not require bash to run the scriptMaxin john2011-03-301-2/+2
* | Merge branch 'mg/rev-list-n-parents'Junio C Hamano2011-03-261-0/+2
|\ \
| * | rev-list --min-parents,--max-parents: doc, test and completionMichael J Gruber2011-03-231-0/+2
* | | Merge branch 'jp/completion-help-alias'Junio C Hamano2011-03-261-1/+1
|\ \ \
View Lorry Controller Status