summaryrefslogtreecommitdiff
path: root/contrib
AgeCommit message (Expand)AuthorFilesLines
2012-02-23Merge branch 'ld/git-p4-expanded-keywords'Libravatar Junio C Hamano1-10/+108
2012-02-23git-p4: add initial support for RCS keywordsLibravatar Luke Diamand1-10/+108
2012-02-22Sync with 1.7.9.2Libravatar Junio C Hamano1-16/+4
2012-02-22completion: normalize increment/decrement styleLibravatar Philip Jägenstedt1-12/+10
2012-02-22completion: remote set-* <name> and <branch>Libravatar Philip Jägenstedt1-3/+9
2012-02-22completion: use tabs for indentationLibravatar Philip Jägenstedt1-4/+4
2012-02-22completion: remove stale "to submit patches" documentationLibravatar Philip Jägenstedt1-12/+0
2012-02-22git-p4: the option to specify 'host' is -H, not -hLibravatar Russell Myers1-1/+1
2012-02-21Merge branch 'master' of git://bogomips.org/git-svnLibravatar Junio C Hamano1-1/+1
2012-02-21Merge branch 'jk/diff-highlight'Libravatar Junio C Hamano2-37/+181
2012-02-21Merge branch 'maint'Libravatar Junio C Hamano1-1/+1
2012-02-21Merge branch 'fc/zsh-completion' into maintLibravatar Junio C Hamano1-56/+11
2012-02-21completion: add --interactive option to git svn dcommitLibravatar Frederic Heitzmann1-1/+1
2012-02-21completion: Allow dash as the first character for __git_ps1Libravatar Christian Hammerl1-1/+1
2012-02-16Sync with maintLibravatar Junio C Hamano1-1/+1
2012-02-16completion: --list option for git-branchLibravatar Ralf Thielow1-1/+1
2012-02-16Merge branch 'rt/completion-branch-edit-desc' into maintLibravatar Junio C Hamano1-1/+1
2012-02-13diff-highlight: document some non-optimal casesLibravatar Jeff King1-0/+93
2012-02-13diff-highlight: match multi-line hunksLibravatar Jeff King2-34/+52
2012-02-13diff-highlight: refactor to prepare for multi-line hunksLibravatar Jeff King1-8/+14
2012-02-13diff-highlight: don't highlight whole linesLibravatar Jeff King1-2/+26
2012-02-13diff-highlight: make perl strict and warnings fatalLibravatar Jeff King1-0/+3
2012-02-12Merge branch 'fc/zsh-completion'Libravatar Junio C Hamano1-56/+11
2012-02-07Merge branch 'jn/svn-fe'Libravatar Junio C Hamano1-4/+4
2012-02-07Merge branch 'rt/completion-branch-edit-desc'Libravatar Junio C Hamano1-1/+1
2012-02-06completion: simplify __gitcomp and __gitcomp_nl implementationsLibravatar Felipe Contreras1-16/+3
2012-02-06completion: use ls -1 instead of rolling a loop to do that ourselvesLibravatar Felipe Contreras1-37/+2
2012-02-06completion: work around zsh option propagation bugLibravatar Felipe Contreras1-3/+6
2012-02-06completion: --edit and --no-edit for git-mergeLibravatar Adrian Weimann1-1/+1
2012-01-31Merge branch 'va/git-p4-branch'Libravatar Junio C Hamano1-2/+46
2012-01-31Merge branch 'ld/git-p4-branches-and-labels'Libravatar Junio C Hamano1-35/+44
2012-01-30completion: --edit and --no-edit for git-mergeLibravatar Adrian Weimann1-1/+1
2012-01-29completion: --edit-description option for git-branchLibravatar Ralf Thielow1-1/+1
2012-01-29Merge branch 'pw/p4-view-updates'Libravatar Junio C Hamano1-4/+5
2012-01-27Merge branch 'svn-fe' of git://repo.or.cz/git/jrn into jn/svn-feLibravatar Junio C Hamano1-4/+4
2012-01-26git-completion: workaround zsh COMPREPLY bugLibravatar Felipe Contreras1-0/+8
2012-01-26git-p4: Change p4 command invocationLibravatar Pete Wyckoff1-1/+1
2012-01-26git-p4: Search for parent commit on branch creationLibravatar Vitor Antunes1-1/+45
2012-01-20git-p4: importing labels should cope with missing ownerLibravatar Luke Diamand1-28/+35
2012-01-20git-p4: cope with labels with empty descriptionsLibravatar Luke Diamand1-3/+5
2012-01-20git-p4: handle p4 branches and labels containing shell charsLibravatar Luke Diamand1-4/+4
2012-01-11git-p4: clarify commentLibravatar Pete Wyckoff1-1/+2
2012-01-11git-p4: fix verbose comment typoLibravatar Pete Wyckoff1-1/+1
2012-01-11git-p4: only a single ... wildcard is supportedLibravatar Pete Wyckoff1-2/+2
2012-01-03git-p4: rewrite view handlingLibravatar Pete Wyckoff1-89/+246
2012-01-03git-p4: support single file p4 client view mapsLibravatar Gary Gibbons1-9/+20
2012-01-03git-p4: sort client views by reverse View numberLibravatar Gary Gibbons1-2/+9
2012-01-03git-p4: fix test for unsupported P4 Client ViewsLibravatar Gary Gibbons1-1/+4
2012-01-03Merge branch 'pw/p4-docs-and-tests'Libravatar Junio C Hamano2-305/+29
2011-12-27git-p4: document and test submit optionsLibravatar Pete Wyckoff1-0/+7