summaryrefslogtreecommitdiff
path: root/contrib
AgeCommit message (Expand)Author
2012-02-23Merge branch 'ld/git-p4-expanded-keywords'Junio C Hamano
2012-02-23git-p4: add initial support for RCS keywordsLuke Diamand
2012-02-23Sync with 1.7.9.2Junio C Hamano
2012-02-22completion: use tabs for indentationPhilip Jägenstedt
2012-02-22completion: remove stale "to submit patches" documentationPhilip Jägenstedt
2012-02-22git-p4: the option to specify 'host' is -H, not -hRussell Myers
2012-02-22Merge branch 'master' of git://bogomips.org/git-svnJunio C Hamano
2012-02-21Merge branch 'jk/diff-highlight'Junio C Hamano
2012-02-21Merge branch 'maint'Junio C Hamano
2012-02-21Merge branch 'fc/zsh-completion' into maintJunio C Hamano
2012-02-21completion: add --interactive option to git svn dcommitFrederic Heitzmann
2012-02-21completion: Allow dash as the first character for __git_ps1Christian Hammerl
2012-02-16Sync with maintJunio C Hamano
2012-02-16completion: --list option for git-branchRalf Thielow
2012-02-16Merge branch 'rt/completion-branch-edit-desc' into maintJunio C Hamano
2012-02-13diff-highlight: document some non-optimal casesJeff King
2012-02-13diff-highlight: match multi-line hunksJeff King
2012-02-13diff-highlight: refactor to prepare for multi-line hunksJeff King
2012-02-13diff-highlight: don't highlight whole linesJeff King
2012-02-13diff-highlight: make perl strict and warnings fatalJeff King
2012-02-13Merge branch 'fc/zsh-completion'Junio C Hamano
2012-02-07Merge branch 'jn/svn-fe'Junio C Hamano
2012-02-07Merge branch 'rt/completion-branch-edit-desc'Junio C Hamano
2012-02-06completion: simplify __gitcomp and __gitcomp_nl implementationsFelipe Contreras
2012-02-06completion: use ls -1 instead of rolling a loop to do that ourselvesFelipe Contreras
2012-02-06completion: work around zsh option propagation bugFelipe Contreras
2012-02-06completion: --edit and --no-edit for git-mergeAdrian Weimann
2012-02-01Merge branch 'va/git-p4-branch'Junio C Hamano
2012-02-01Merge branch 'ld/git-p4-branches-and-labels'Junio C Hamano
2012-01-30completion: --edit and --no-edit for git-mergeAdrian Weimann
2012-01-29completion: --edit-description option for git-branchRalf Thielow
2012-01-29Merge branch 'pw/p4-view-updates'Junio C Hamano
2012-01-27Merge branch 'svn-fe' of git://repo.or.cz/git/jrn into jn/svn-feJunio C Hamano
2012-01-26git-completion: workaround zsh COMPREPLY bugFelipe Contreras
2012-01-26git-p4: Change p4 command invocationPete Wyckoff
2012-01-26git-p4: Search for parent commit on branch creationVitor Antunes
2012-01-20git-p4: importing labels should cope with missing ownerLuke Diamand
2012-01-20git-p4: cope with labels with empty descriptionsLuke Diamand
2012-01-20git-p4: handle p4 branches and labels containing shell charsLuke Diamand
2012-01-12git-p4: clarify commentPete Wyckoff
2012-01-12git-p4: fix verbose comment typoPete Wyckoff
2012-01-12git-p4: only a single ... wildcard is supportedPete Wyckoff
2012-01-03git-p4: rewrite view handlingPete Wyckoff
2012-01-03git-p4: support single file p4 client view mapsGary Gibbons
2012-01-03git-p4: sort client views by reverse View numberGary Gibbons
2012-01-03git-p4: fix test for unsupported P4 Client ViewsGary Gibbons
2012-01-03Merge branch 'pw/p4-docs-and-tests'Junio C Hamano
2011-12-27git-p4: document and test submit optionsPete Wyckoff
2011-12-27git-p4: test and document --use-client-specPete Wyckoff
2011-12-27git-p4: honor --changesfile option and testPete Wyckoff