summaryrefslogtreecommitdiff
path: root/contrib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'da/subtree-date-confusion'Junio C Hamano2015-08-032-1/+5
|\
| * contrib/subtree: ignore log.date configurationda/subtree-date-confusionDavid Aguilar2015-07-232-1/+5
* | Merge branch 'sg/bash-prompt-untracked-optim'Junio C Hamano2015-08-031-1/+1
|\ \
| * | bash prompt: faster untracked status indicator with untracked directoriessg/bash-prompt-untracked-optimSZEDER Gábor2015-07-201-1/+1
| |/
| * Merge branch 'jc/prompt-document-ps1-state-separator' into maintJunio C Hamano2015-07-151-0/+4
| |\
| * \ Merge branch 'af/tcsh-completion-noclobber' into maintJunio C Hamano2015-07-151-1/+1
| |\ \
| * \ \ Merge branch 'pa/auto-gc-mac-osx' into maintJunio C Hamano2015-07-151-1/+1
| |\ \ \
| * \ \ \ Merge branch 'sg/complete-decorate-full-not-long' into maintJunio C Hamano2015-05-261-1/+1
| |\ \ \ \
* | \ \ \ \ Merge branch 'pt/pull-builtin'Junio C Hamano2015-08-031-0/+381
|\ \ \ \ \ \
| * | | | | | pull: remove redirection to git-pull.shPaul Tan2015-06-181-0/+333
* | | | | | | Merge branch 'cb/subtree-tests-update'Junio C Hamano2015-07-101-152/+150
|\ \ \ \ \ \ \
| * | | | | | | contrib/subtree: small tidy-up to testcb/subtree-tests-updateCharles Bailey2015-06-221-3/+1
| * | | | | | | contrib/subtree: fix broken &&-chains and revealed test errorCharles Bailey2015-06-221-4/+4
| * | | | | | | contrib/subtree: use tabs consitently for indentation in testsCharles Bailey2015-06-221-147/+147
| | |/ / / / / | |/| | | | |
* | | | | | | git-multimail: update to release 1.1.1Matthieu Moy2015-07-064-6/+17
* | | | | | | Merge branch 'jc/prompt-document-ps1-state-separator'Junio C Hamano2015-07-011-0/+4
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | git-prompt.sh: document GIT_PS1_STATESEPARATORjc/prompt-document-ps1-state-separatorJoe Cridge2015-06-101-0/+4
* | | | | | | Merge branch 'pa/auto-gc-mac-osx'Junio C Hamano2015-06-241-1/+1
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | hooks/pre-auto-gc: adjust power checking for newer OS Xpa/auto-gc-mac-osxPanagiotis Astithas2015-06-121-1/+1
* | | | | | | Merge branch 'af/tcsh-completion-noclobber'Junio C Hamano2015-06-241-1/+1
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | git-completion.tcsh: fix redirect with noclobberaf/tcsh-completion-noclobberAriel Faigon2015-06-091-1/+1
* | | | | | | Merge branch 'sg/completion-commit-cleanup'Junio C Hamano2015-06-241-1/+1
|\ \ \ \ \ \ \
| * | | | | | | completion: teach 'scissors' mode to 'git commit --cleanup='sg/completion-commit-cleanupSZEDER Gábor2015-06-081-1/+1
| |/ / / / / /
* | | | | | | git-multimail: update to release 1.1.0Matthieu Moy2015-06-186-326/+1017
* | | | | | | Merge branch 'tb/complete-sequencing'Junio C Hamano2015-06-111-0/+5
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | completion: suggest sequencer commands for reverttb/complete-sequencingThomas Braun2015-06-011-0/+5
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'sg/completion-config'Junio C Hamano2015-05-221-24/+14
|\ \ \ \ \ \
| * | | | | | completion: simplify query for config variablessg/completion-configSZEDER Gábor2015-05-121-7/+3
| * | | | | | completion: add a helper function to get config variablesSZEDER Gábor2015-05-121-20/+14
* | | | | | | Merge branch 'ls/http-ssl-cipher-list'Junio C Hamano2015-05-221-0/+1
|\ \ \ \ \ \ \
| * | | | | | | http: add support for specifying an SSL cipher listls/http-ssl-cipher-listLars Kellogg-Stedman2015-05-081-0/+1
* | | | | | | | Merge branch 'dl/subtree-avoid-tricky-echo'Junio C Hamano2015-05-221-3/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | contrib/subtree: portability fix for string printingdl/subtree-avoid-tricky-echoDanny Lin2015-05-081-3/+10
| |/ / / / / / /
* | | | | | | | Merge branch 'dl/subtree-push-no-squash'Junio C Hamano2015-05-222-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | contrib/subtree: there's no push --squashdl/subtree-push-no-squashDanny Lin2015-05-072-2/+2
| |/ / / / / / /
* | | | | | | | Merge branch 'sg/completion-omit-credential-helpers'Junio C Hamano2015-05-221-2/+2
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | completion: remove credential helpers from porcelain commandssg/completion-omit-credential-helpersSZEDER Gábor2015-05-061-2/+2
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'sg/completion-no-redundant-all-command-list'Junio C Hamano2015-05-111-1/+0
|\ \ \ \ \ \ \
| * | | | | | | completion: remove redundant __git_compute_all_commands() callsg/completion-no-redundant-all-command-listSZEDER Gábor2015-05-031-1/+0
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'sg/complete-decorate-full-not-long'Junio C Hamano2015-05-111-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | / | | |_|_|_|/ | |/| | | |
| * | | | | completion: fix and update 'git log --decorate=' optionssg/complete-decorate-full-not-longSZEDER Gábor2015-05-031-1/+1
* | | | | | Merge branch 'mh/multimail-renewal'Junio C Hamano2015-04-282-24/+25
|\ \ \ \ \ \
| * | | | | | Update git-multimail to version 1.0.2mh/multimail-renewalMichael Haggerty2015-04-282-24/+25
| | |_|/ / / | |/| | | |
| * | | | | Merge branch 'ma/bash-completion-leaking-x' into maintJunio C Hamano2015-04-271-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jk/colors' into maintJunio C Hamano2015-04-211-2/+7
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'sg/completion-gitcomp-nl-for-refs' into maintJunio C Hamano2015-03-281-2/+2
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'ct/prompt-untracked-fix' into maintJunio C Hamano2015-03-281-1/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'js/completion-ctags-pattern-substitution-fix' into maintJunio C Hamano2015-03-271-1/+1
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'sg/completion-remote' into maintJunio C Hamano2015-03-231-5/+2
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'mg/doc-status-color-slot' into maintJunio C Hamano2015-03-231-0/+1
| |\ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status