summaryrefslogtreecommitdiff
path: root/contrib
Commit message (Expand)AuthorAgeFilesLines
* Revert "Merge branch 'jc/graduate-remote-hg-bzr' (early part)"Junio C Hamano2014-05-208-4323/+13
* Merge branch 'jc/graduate-remote-hg-bzr' (early part)Junio C Hamano2014-05-193-0/+25
|\
| * remote-helpers: point at their upstream repositoriesJunio C Hamano2014-05-191-0/+19
| * contrib: remote-helpers: add move warnings (v2.0)Felipe Contreras2014-05-192-0/+6
* | Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname'Junio C Hamano2014-05-191-17/+39
|\ \
| * | git-prompt.sh: don't assume the shell expands the value of PS1rh/prompt-pcmode-avoid-eval-on-refnameRichard Hansen2014-05-191-17/+39
* | | Merge branch 'fc/prompt-zsh-read-from-file'Junio C Hamano2014-05-131-8/+8
|\ \ \ | |_|/ |/| |
| * | contrib: completion: fix 'eread()' namespacefc/prompt-zsh-read-from-fileFelipe Contreras2014-05-131-8/+8
* | | Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname'Junio C Hamano2014-05-021-2/+32
|\ \ \ | | |/ | |/|
| * | git-prompt.sh: don't put unsanitized branch names in $PS1Richard Hansen2014-04-221-2/+32
| * | Merge branch 'mi/typofixes' into maintJunio C Hamano2013-12-174-4/+4
| |\ \
* | \ \ Merge branch 'ep/shell-command-substitution'Junio C Hamano2014-04-2112-39/+39
|\ \ \ \
| * | | | t9362-mw-to-git-utf8.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-171-2/+2
| * | | | t9360-mw-to-git-clone.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-171-7/+7
| * | | | git-tag.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-171-1/+1
| * | | | git-revert.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-171-1/+1
| * | | | git-resolve.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-171-1/+1
| * | | | git-repack.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-171-1/+1
| * | | | git-merge.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-171-2/+2
| * | | | git-ls-remote.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-171-2/+2
| * | | | git-fetch.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-171-3/+3
| * | | | git-commit.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-171-5/+5
| * | | | git-clone.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-171-10/+10
| * | | | git-checkout.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-171-4/+4
* | | | | Merge branch 'fc/remote-helper-fixes'Junio C Hamano2014-04-185-5/+34
|\ \ \ \ \
| * | | | | remote-bzr: trivial test fixfc/remote-helper-fixesFelipe Contreras2014-04-141-1/+1
| * | | | | remote-bzr: include authors field in pushed commitsdequis2014-04-092-0/+26
| * | | | | remote-bzr: add support for older versionsFelipe Contreras2014-04-091-2/+2
| * | | | | remote-hg: always normalize pathsFelipe Contreras2014-04-091-0/+1
| * | | | | remote-helpers: allow all tests running from any dirFelipe Contreras2014-04-092-2/+4
* | | | | | Merge branch 'fc/complete-aliased-push'Junio C Hamano2014-04-182-0/+2
|\ \ \ \ \ \
| * | | | | | completion: fix completing args of aliased "push", "fetch", etc.fc/complete-aliased-pushFelipe Contreras2014-04-092-0/+2
* | | | | | | Merge branch 'fc/prompt-zsh-read-from-file'Junio C Hamano2014-04-181-7/+14
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | prompt: fix missing file errors in zshFelipe Contreras2014-04-141-7/+14
| |/ / / / /
* | | | | | Merge branch 'mh/multimail'Junio C Hamano2014-04-165-56/+249
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | git-multimail: update to version 1.0.0mh/multimailMichael Haggerty2014-04-075-56/+249
* | | | | | Merge branch 'jl/nor-or-nand-and'Junio C Hamano2014-04-085-8/+8
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | comments: fix misuses of "nor"Justin Lebar2014-03-313-5/+5
| * | | | | contrib: fix misuses of "nor"Justin Lebar2014-03-312-3/+3
| |/ / / /
* | | | | Merge branch 'ap/remote-hg-skip-null-bookmarks'Junio C Hamano2014-04-022-1/+77
|\ \ \ \ \
| * | | | | remote-hg: do not fail on invalid bookmarksap/remote-hg-skip-null-bookmarksMax Horn2014-03-252-1/+77
| | |_|/ / | |/| | |
* | | | | Merge branch 'jk/subtree-prefix'Junio C Hamano2014-03-281-0/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | subtree: initialize "prefix" variablejk/subtree-prefixJeff King2014-03-171-0/+1
* | | | | Merge branch 'fc/transport-helper-fixes'Junio C Hamano2014-03-183-4/+53
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | remote-bzr: support the new 'force' optionfc/transport-helper-fixesRichard Hansen2014-02-242-2/+51
| * | | | test-hg.sh: tests are now expected to passRichard Hansen2014-02-241-2/+2
* | | | | Merge branch 'lb/contrib-contacts-looser-diff-parsing'Junio C Hamano2014-03-141-2/+0
|\ \ \ \ \
| * | | | | git-contacts: do not fail parsing of good diffslb/contrib-contacts-looser-diff-parsingLars Gullik Bjønnes2014-02-181-2/+0
| | |_|/ / | |/| | |
* | | | | Merge branch 'ss/completion-rec-sub-fetch-push'Junio C Hamano2014-03-141-1/+18
|\ \ \ \ \
| * | | | | completion: teach --recurse-submodules to fetch, pull and pushss/completion-rec-sub-fetch-pushSup Yut Sum2014-02-111-1/+18
View Lorry Controller Status