summaryrefslogtreecommitdiff
path: root/contrib
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | git-p4: sort client views by reverse View numberGary Gibbons2012-01-031-2/+9
* | | git-p4: fix test for unsupported P4 Client ViewsGary Gibbons2012-01-031-1/+4
* | | Merge branch 'pw/p4-docs-and-tests'Junio C Hamano2012-01-032-305/+29
|\ \ \
| * | | git-p4: document and test submit optionspw/p4-docs-and-testsPete Wyckoff2011-12-271-0/+7
| * | | git-p4: test and document --use-client-specPete Wyckoff2011-12-271-1/+5
| * | | git-p4: honor --changesfile option and testPete Wyckoff2011-12-271-1/+15
| * | | git-p4: clone does not use --git-dirPete Wyckoff2011-12-271-1/+2
| * | | git-p4: introduce asciidoc documentationPete Wyckoff2011-12-271-302/+0
* | | | Merge branch 'tr/bash-read-unescaped'Junio C Hamano2011-12-221-6/+6
|\ \ \ \
| * | | | bash completion: use read -r everywheretr/bash-read-unescapedThomas Rast2011-12-211-6/+6
| |/ / /
* | | | Merge branch 'jk/git-prompt'Junio C Hamano2011-12-223-0/+188
|\ \ \ \ | |/ / / |/| | |
| * | | contrib: add credential helper for OS X Keychainjk/git-promptJeff King2011-12-123-0/+188
* | | | git-p4: fix skipSubmitEdit regressionPete Wyckoff2011-12-171-7/+11
* | | | git-p4: use absolute directory for PWD env varGary Gibbons2011-12-111-2/+3
* | | | git-p4: ensure submit clientPath exists before chdirGary Gibbons2011-12-111-0/+4
* | | | Merge branch 'sg/complete-refs'Junio C Hamano2011-12-091-91/+110
|\ \ \ \
| * | | | completion: remove broken dead code from __git_heads() and __git_tags()sg/complete-refsSZEDER Gábor2011-10-211-20/+2
| * | | | completion: fast initial completion for config 'remote.*.fetch' valueSZEDER Gábor2011-10-211-0/+4
| * | | | completion: improve ls-remote output filtering in __git_refs_remotes()SZEDER Gábor2011-10-211-9/+4
| * | | | completion: query only refs/heads/ in __git_refs_remotes()SZEDER Gábor2011-10-211-8/+5
View Lorry Controller Status