summaryrefslogtreecommitdiff
path: root/contrib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sg/config-name-only'Junio C Hamano2015-08-311-12/+4
|\
| * completion: list variable names reliably with 'git config --name-only'SZEDER Gábor2015-08-101-12/+3
| * config: add '--name-only' option to list only variable namesSZEDER Gábor2015-08-101-0/+1
* | Merge branch 'ep/http-configure-ssl-version'Junio C Hamano2015-08-261-0/+1
|\ \
| * | http: add support for specifying the SSL versionep/http-configure-ssl-versionElia Pinto2015-08-171-0/+1
* | | Sync with maintJunio C Hamano2015-08-251-1/+1
|\ \ \
| * \ \ Merge branch 'da/subtree-date-confusion' into maintJunio C Hamano2015-08-192-1/+5
| |\ \ \ | | |/ / | |/| |
* | | | Merge branch 'tb/complete-rebase-i-edit-todo'Junio C Hamano2015-08-191-1/+4
|\ \ \ \
| * | | | completion: offer '--edit-todo' during interactive rebasetb/complete-rebase-i-edit-todoThomas Braun2015-08-051-1/+4
| |/ / /
* | | | Merge branch 'jk/git-path'Junio C Hamano2015-08-191-2/+2
|\ \ \ \
| * | | | memoize common git-path "constant" filesjk/git-pathJeff King2015-08-101-2/+2
* | | | | Merge branch 'mm/pull-upload-pack'Junio C Hamano2015-08-191-1/+1
|\ \ \ \ \ | | |_|_|/ | |/| | |
* | | | | Merge branch 'pt/am-builtin'Junio C Hamano2015-08-121-0/+975
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | builtin-am: remove redirection to git-am.shPaul Tan2015-08-041-0/+975
* | | | | 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
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |