summaryrefslogtreecommitdiff
path: root/contrib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'so/prompt-command'Junio C Hamano2012-12-271-12/+20
|\
| * make __git_ps1 accept a third parameter in pcmodeSimon Oosthoek2012-12-261-12/+20
* | Merge branch 'jk/mailmap-cleanup'Junio C Hamano2012-12-211-32/+64
|\ \
| * | contrib: update stats/mailmap scriptJeff King2012-12-121-32/+64
* | | Merge branch 'so/prompt-command'Junio C Hamano2012-12-121-5/+11
|\ \ \ | | |/ | |/|
| * | git-prompt.sh: update PROMPT_COMMAND documentationJunio C Hamano2012-12-121-5/+11
* | | Add file completion to tcsh git completion.Marc Khouzam2012-12-111-15/+54
* | | Merge branch 'maint'Junio C Hamano2012-12-111-1/+10
|\ \ \ | | |/ | |/|
| * | git-prompt: Document GIT_PS1_DESCRIBE_STYLEAnders Kaseorg2012-12-111-0/+9
* | | Merge branch 'fc/remote-hg'Junio C Hamano2012-11-295-0/+1637
|\ \ \
| * | | remote-hg: fix for older versions of pythonFelipe Contreras2012-11-271-4/+8
| * | | remote-hg: fix for files with spacesFelipe Contreras2012-11-271-1/+1
| * | | remote-hg: avoid bad refsFelipe Contreras2012-11-121-0/+3
| * | | remote-hg: try the 'tip' if no checkout presentFelipe Contreras2012-11-121-0/+2
| * | | remote-hg: fix compatibility with older versions of hgFelipe Contreras2012-11-121-1/+1
| * | | remote-hg: add missing config for basic testsRamkumar Ramachandra2012-11-121-0/+9
| * | | remote-hg: the author email can be nullFelipe Contreras2012-11-041-3/+3
| * | | remote-hg: add option to not track branchesFelipe Contreras2012-11-041-8/+14
| * | | remote-hg: add extra author testFelipe Contreras2012-11-041-1/+5
| * | | remote-hg: add tests to compare with hg-gitFelipe Contreras2012-11-041-0/+462
| * | | remote-hg: add bidirectional testsFelipe Contreras2012-11-041-0/+243
| * | | remote-hg: add basic testsFelipe Contreras2012-11-042-0/+125
| * | | remote-hg: fake bookmark when there's noneFelipe Contreras2012-11-041-5/+14
| * | | remote-hg: add compat for hg-git author fixesFelipe Contreras2012-11-041-6/+53
| * | | remote-hg: add support for hg-git compat modeFelipe Contreras2012-11-041-6/+83
| * | | remote-hg: match hg merge behaviorFelipe Contreras2012-11-041-0/+17
| * | | remote-hg: make sure the encoding is correctFelipe Contreras2012-11-041-1/+11
| * | | remote-hg: add support to push URLsFelipe Contreras2012-11-041-2/+12
| * | | remote-hg: add support for remote pushingFelipe Contreras2012-11-041-2/+7
| * | | remote-hg: add support for pushingFelipe Contreras2012-11-041-2/+215
| * | | Add new remote-hg transport helperFelipe Contreras2012-11-041-0/+391
* | | | Merge branch 'mk/complete-tcsh'Junio C Hamano2012-11-291-7/+12
|\ \ \ \
| * | | | Support for git aliasing for tcsh completionMarc Khouzam2012-11-271-7/+12
* | | | | Merge branch 'maint'Junio C Hamano2012-11-292-3/+39
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | git-remote-mediawiki: escape ", \, and LF in file namesMatthieu Moy2012-11-292-3/+39
* | | | | completion: fix warning for zshFelipe Contreras2012-11-291-0/+2
* | | | | Merge branch 'maint'Junio C Hamano2012-11-281-0/+2
|\ \ \ \ \ | |/ / / /
| * | | | completion: add options --single-branch and --branch to "git clone"Ralf Thielow2012-11-281-0/+2
* | | | | Merge branch 'fc/zsh-completion'Junio C Hamano2012-11-282-43/+139
|\ \ \ \ \
| * | | | | completion: start moving to the new zsh completionFelipe Contreras2012-11-191-43/+61
| * | | | | completion: add new zsh completionFelipe Contreras2012-11-191-0/+78
* | | | | | emacs: make 'git-status' work with separate git dirsEnrico Scholz2012-11-261-1/+1
* | | | | | Merge branch 'mk/complete-tcsh'Junio C Hamano2012-11-251-0/+63
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | tcsh-completion re-using git-completion.bashMarc Khouzam2012-11-161-0/+63
* | | | | | Merge branch 'sg/complete-help-undup'Junio C Hamano2012-11-251-1/+1
|\ \ \ \ \ \
| * | | | | | completion: remove 'help' duplicate from porcelain commandsSZEDER Gábor2012-11-141-1/+1
| |/ / / / /
* | | | | | Sync with 1.8.0.1Junio C Hamano2012-11-251-1/+1
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Completion must sort before using uniqMarc Khouzam2012-11-241-1/+1
| |/ / / /
* | | | | Merge branch 'so/prompt-command'Junio C Hamano2012-11-211-8/+90
|\ \ \ \ \ | |_|/ / / |/| | | / | | |_|/ | |/| |
| * | | coloured git-prompt: paint detached HEAD marker in redJunio C Hamano2012-10-171-1/+1