summaryrefslogtreecommitdiff
path: root/contrib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fc/remote-bzr'Junio C Hamano2013-01-092-0/+868
|\
| * remote-bzr: detect local repositoriesFelipe Contreras2013-01-021-20/+28
| * remote-bzr: add support for older versions of bzrFelipe Contreras2013-01-021-5/+9
| * remote-bzr: add support to push special modesFelipe Contreras2013-01-021-17/+43
| * remote-bzr: add support for fecthing special modesFelipe Contreras2013-01-022-11/+59
| * remote-bzr: add simple testsFelipe Contreras2013-01-021-0/+111
| * remote-bzr: update working tree upon pushingFelipe Contreras2012-12-131-0/+2
| * remote-bzr: add support for remote repositoriesFelipe Contreras2012-11-281-2/+24
| * remote-bzr: add support for pushingFelipe Contreras2012-11-281-0/+295
| * Add new remote-bzr transport helperFelipe Contreras2012-11-281-0/+352
* | Merge branch 'er/python-version-requirements'Junio C Hamano2013-01-095-2/+27
|\ \
| * | Add checks to Python scripts for version dependencies.Eric S. Raymond2012-12-285-2/+27
* | | Merge branch 'maint'Junio C Hamano2013-01-082-2/+2
|\ \ \
| * \ \ Merge branch 'ms/subtree-fixlets' into maintJunio C Hamano2013-01-082-1/+2
| |\ \ \
| * | | | remote-hg: Fix biridectionality -> bidirectionality typosW. Trevor King2013-01-082-2/+2
* | | | | Merge branch 'jk/complete-commit-c'Junio C Hamano2013-01-051-0/+7
|\ \ \ \ \
| * | | | | completion: complete refs for "git commit -c"Jeff King2012-12-151-0/+7
| | |_|/ / | |/| | |
* | | | | Merge branch 'ms/subtree-fixlets'Junio C Hamano2013-01-032-1/+2
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| |
| * | | git-subtree: fix typo in manpageMichael Schubert2012-12-221-1/+1
| * | | git-subtree: ignore git-subtree executableMichael Schubert2012-12-221-0/+1
* | | | 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