summaryrefslogtreecommitdiff
path: root/contrib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'maint'Junio C Hamano2012-02-261-33/+64
|\
| * git-p4: fix submit regression with clientSpec and subdir clonePete Wyckoff2012-02-261-32/+54
| * git-p4: set useClientSpec variable on initial clonePete Wyckoff2012-02-261-1/+10
* | Merge branch 'ld/git-p4-expanded-keywords'Junio C Hamano2012-02-231-10/+108
|\ \
| * | git-p4: add initial support for RCS keywordsld/git-p4-expanded-keywordsLuke Diamand2012-02-231-10/+108
* | | Sync with 1.7.9.2Junio C Hamano2012-02-221-16/+4
|\ \ \ | | |/ | |/|
| * | completion: use tabs for indentationPhilip Jägenstedt2012-02-221-4/+4
| * | completion: remove stale "to submit patches" documentationPhilip Jägenstedt2012-02-221-12/+0
* | | git-p4: the option to specify 'host' is -H, not -hRussell Myers2012-02-221-1/+1
* | | Merge branch 'master' of git://bogomips.org/git-svnJunio C Hamano2012-02-211-1/+1
|\ \ \
| * | | completion: add --interactive option to git svn dcommitFrederic Heitzmann2012-02-211-1/+1
* | | | Merge branch 'jk/diff-highlight'Junio C Hamano2012-02-212-37/+181
|\ \ \ \
| * | | | diff-highlight: document some non-optimal casesjk/diff-highlightJeff King2012-02-131-0/+93
| * | | | diff-highlight: match multi-line hunksJeff King2012-02-132-34/+52
| * | | | diff-highlight: refactor to prepare for multi-line hunksJeff King2012-02-131-8/+14
| * | | | diff-highlight: don't highlight whole linesJeff King2012-02-131-2/+26
| * | | | diff-highlight: make perl strict and warnings fatalJeff King2012-02-131-0/+3
* | | | | Merge branch 'maint'Junio C Hamano2012-02-211-1/+1
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| |
| * | | Merge branch 'fc/zsh-completion' into maintJunio C Hamano2012-02-211-56/+11
| |\ \ \
| * | | | completion: Allow dash as the first character for __git_ps1Christian Hammerl2012-02-211-1/+1
* | | | | Sync with maintJunio C Hamano2012-02-161-1/+1
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | |
| * | | completion: --list option for git-branchRalf Thielow2012-02-161-1/+1
| * | | Merge branch 'rt/completion-branch-edit-desc' into maintJunio C Hamano2012-02-161-1/+1
| |\ \ \
| * | | | completion: --edit and --no-edit for git-mergeAdrian Weimann2012-02-061-1/+1
* | | | | Merge branch 'fc/zsh-completion'Junio C Hamano2012-02-121-56/+11
|\ \ \ \ \ | | |_|/ / | |/| | / | |_|_|/ |/| | |
| * | | completion: simplify __gitcomp and __gitcomp_nl implementationsfc/zsh-completionFelipe Contreras2012-02-061-16/+3
| * | | completion: use ls -1 instead of rolling a loop to do that ourselvesFelipe Contreras2012-02-061-37/+2
| * | | completion: work around zsh option propagation bugFelipe Contreras2012-02-061-3/+6
| |/ /
* | | Merge branch 'jn/svn-fe'Junio C Hamano2012-02-071-4/+4
|\ \ \
| * \ \ Merge branch 'svn-fe' of git://repo.or.cz/git/jrn into jn/svn-feJunio C Hamano2012-01-271-4/+4
| |\ \ \
| | * | | vcs-svn: implement text-delta handlingDavid Barr2011-05-261-4/+1
| | * | | Merge branch 'db/vcs-svn-incremental' into svn-feJonathan Nieder2011-05-261-1/+5
| | |\ \ \
| | | * | | vcs-svn: set up channel to read fast-import cat-blob responseDavid Barr2011-03-071-1/+5
* | | | | | Merge branch 'rt/completion-branch-edit-desc'Junio C Hamano2012-02-071-1/+1
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | completion: --edit-description option for git-branchrt/completion-branch-edit-descRalf Thielow2012-01-291-1/+1
| | |_|_|/ | |/| | |
* | | | | Merge branch 'va/git-p4-branch'Junio C Hamano2012-01-311-2/+46
|\ \ \ \ \
| * | | | | git-p4: Change p4 command invocationPete Wyckoff2012-01-261-1/+1
| * | | | | git-p4: Search for parent commit on branch creationVitor Antunes2012-01-261-1/+45
* | | | | | Merge branch 'ld/git-p4-branches-and-labels'Junio C Hamano2012-01-311-35/+44
|\ \ \ \ \ \ | |/ / / / /
| * | | | | git-p4: importing labels should cope with missing ownerLuke Diamand2012-01-201-28/+35
| * | | | | git-p4: cope with labels with empty descriptionsLuke Diamand2012-01-201-3/+5
| * | | | | git-p4: handle p4 branches and labels containing shell charsLuke Diamand2012-01-201-4/+4
| | |/ / / | |/| | |
* | | | | completion: --edit and --no-edit for git-mergeAdrian Weimann2012-01-301-1/+1
* | | | | Merge branch 'pw/p4-view-updates'Junio C Hamano2012-01-291-4/+5
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | git-p4: clarify commentPete Wyckoff2012-01-111-1/+2
| * | | | git-p4: fix verbose comment typoPete Wyckoff2012-01-111-1/+1
| * | | | git-p4: only a single ... wildcard is supportedPete Wyckoff2012-01-111-2/+2
| |/ / /
* | | | git-completion: workaround zsh COMPREPLY bugFelipe Contreras2012-01-261-0/+8
|/ / /
* | | git-p4: rewrite view handlingPete Wyckoff2012-01-031-89/+246
* | | git-p4: support single file p4 client view mapsGary Gibbons2012-01-031-9/+20