summaryrefslogtreecommitdiff
path: root/contrib
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge branch 'ma/bash-completion-leaking-x'Junio C Hamano2015-04-201-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
| * | | | | | | | | | completion: fix global bash variable leak on __gitcompappendma/bash-completion-leaking-xMárcio Almada2015-04-121-1/+1
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jk/colors'Junio C Hamano2015-04-141-2/+7
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| * | | | | | | | | diff-highlight: do not split multibyte charactersjk/colorsKyle J. McKay2015-04-041-2/+7
* | | | | | | | | | Merge branch 'sg/completion-gitcomp-nl-for-refs'Junio C Hamano2015-03-261-2/+2
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| * | | | | | | | | completion: use __gitcomp_nl() for completing refssg/completion-gitcomp-nl-for-refsSZEDER Gábor2015-03-221-2/+2
| | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'av/wincred-with-at-in-username-fix' into maintJunio C Hamano2015-03-051-3/+22
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge branch 'ct/prompt-untracked-fix'Junio C Hamano2015-03-251-1/+1
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| * | | | | | | | | git prompt: use toplevel to find untracked filesct/prompt-untracked-fixCody A Taylor2015-03-151-1/+1
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'js/completion-ctags-pattern-substitution-fix'Junio C Hamano2015-03-231-1/+1
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | contrib/completion: escape the forward slash in __git_match_ctagjs/completion-ctags-pattern-substitution-fixJohn Szakmeister2015-03-141-1/+1
| |/ / / / / / /
* | | | | | | | Merge branch 'jk/push-config'Junio C Hamano2015-03-231-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | push: allow --follow-tags to be set by config push.followTagsjk/push-configDave Olszewski2015-03-141-0/+1
* | | | | | | | | Merge branch 'mg/doc-status-color-slot'Junio C Hamano2015-03-171-0/+1
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | config,completion: add color.status.unmergedmg/doc-status-color-slotMichael J Gruber2015-03-101-0/+1
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'sg/completion-remote'Junio C Hamano2015-03-171-5/+2
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | completion: simplify __git_remotes()sg/completion-remoteSZEDER Gábor2015-03-061-5/+2
| |/ / / / / /
* | | | | | | Merge branch 'av/wincred-with-at-in-username-fix'Junio C Hamano2015-02-181-3/+22
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | / / / | | |_|/ / / | |/| | | |
| * | | | | wincred: fix get credential if username has "@"av/wincred-with-at-in-username-fixAleksey Vasenev2015-01-251-3/+22
* | | | | | Merge branch 'cj/log-invert-grep'Junio C Hamano2015-02-111-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | log: teach --invert-grep optioncj/log-invert-grepChristoph Junghans2015-01-131-1/+1
* | | | | | Merge branch 'tf/prompt-preserve-exit-status'Junio C Hamano2015-01-141-5/+5
|\ \ \ \ \ \
| * | | | | | git-prompt: preserve value of $? in all casestf/prompt-preserve-exit-statusTony Finch2015-01-141-4/+4
* | | | | | | Merge branch 'rh/hide-prompt-in-ignored-directory'Junio C Hamano2015-01-141-7/+17
|\ \ \ \ \ \ \
| * | | | | | | git-prompt.sh: allow to hide prompt for ignored pwdrh/hide-prompt-in-ignored-directoryJess Austin2015-01-071-0/+13
| * | | | | | | git-prompt.sh: if pc mode, immediately set PS1 to a plain promptRichard Hansen2015-01-071-7/+4