Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'cb/subtree-tests-update' | Junio C Hamano | 2015-07-10 | 1 | -152/+150 |
|\ | |||||
| * | contrib/subtree: small tidy-up to testcb/subtree-tests-update | Charles Bailey | 2015-06-22 | 1 | -3/+1 |
| * | contrib/subtree: fix broken &&-chains and revealed test error | Charles Bailey | 2015-06-22 | 1 | -4/+4 |
| * | contrib/subtree: use tabs consitently for indentation in tests | Charles Bailey | 2015-06-22 | 1 | -147/+147 |
* | | git-multimail: update to release 1.1.1 | Matthieu Moy | 2015-07-06 | 4 | -6/+17 |
* | | Merge branch 'jc/prompt-document-ps1-state-separator' | Junio C Hamano | 2015-07-01 | 1 | -0/+4 |
|\ \ | |||||
| * | | git-prompt.sh: document GIT_PS1_STATESEPARATORjc/prompt-document-ps1-state-separator | Joe Cridge | 2015-06-10 | 1 | -0/+4 |
* | | | Merge branch 'pa/auto-gc-mac-osx' | Junio C Hamano | 2015-06-24 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | hooks/pre-auto-gc: adjust power checking for newer OS Xpa/auto-gc-mac-osx | Panagiotis Astithas | 2015-06-12 | 1 | -1/+1 |
* | | | | Merge branch 'af/tcsh-completion-noclobber' | Junio C Hamano | 2015-06-24 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | git-completion.tcsh: fix redirect with noclobberaf/tcsh-completion-noclobber | Ariel Faigon | 2015-06-09 | 1 | -1/+1 |
* | | | | | Merge branch 'sg/completion-commit-cleanup' | Junio C Hamano | 2015-06-24 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | completion: teach 'scissors' mode to 'git commit --cleanup='sg/completion-commit-cleanup | SZEDER Gábor | 2015-06-08 | 1 | -1/+1 |
| |/ / / / | |||||
* | | | | | git-multimail: update to release 1.1.0 | Matthieu Moy | 2015-06-18 | 6 | -326/+1017 |
* | | | | | Merge branch 'tb/complete-sequencing' | Junio C Hamano | 2015-06-11 | 1 | -0/+5 |
|\ \ \ \ \ | |||||
| * | | | | | completion: suggest sequencer commands for reverttb/complete-sequencing | Thomas Braun | 2015-06-01 | 1 | -0/+5 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'sg/completion-config' | Junio C Hamano | 2015-05-22 | 1 | -24/+14 |
|\ \ \ \ \ | |||||
| * | | | | | completion: simplify query for config variablessg/completion-config | SZEDER Gábor | 2015-05-12 | 1 | -7/+3 |
| * | | | | | completion: add a helper function to get config variables | SZEDER Gábor | 2015-05-12 | 1 | -20/+14 |
* | | | | | | Merge branch 'ls/http-ssl-cipher-list' | Junio C Hamano | 2015-05-22 | 1 | -0/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | http: add support for specifying an SSL cipher listls/http-ssl-cipher-list | Lars Kellogg-Stedman | 2015-05-08 | 1 | -0/+1 |
* | | | | | | | Merge branch 'dl/subtree-avoid-tricky-echo' | Junio C Hamano | 2015-05-22 | 1 | -3/+10 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | contrib/subtree: portability fix for string printingdl/subtree-avoid-tricky-echo | Danny Lin | 2015-05-08 | 1 | -3/+10 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'dl/subtree-push-no-squash' | Junio C Hamano | 2015-05-22 | 2 | -2/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | contrib/subtree: there's no push --squashdl/subtree-push-no-squash | Danny Lin | 2015-05-07 | 2 | -2/+2 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'sg/completion-omit-credential-helpers' | Junio C Hamano | 2015-05-22 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | completion: remove credential helpers from porcelain commandssg/completion-omit-credential-helpers | SZEDER Gábor | 2015-05-06 | 1 | -2/+2 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch 'sg/completion-no-redundant-all-command-list' | Junio C Hamano | 2015-05-11 | 1 | -1/+0 |
|\ \ \ \ \ \ | |||||
| * | | | | | | completion: remove redundant __git_compute_all_commands() callsg/completion-no-redundant-all-command-list | SZEDER Gábor | 2015-05-03 | 1 | -1/+0 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch 'sg/complete-decorate-full-not-long' | Junio C Hamano | 2015-05-11 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | completion: fix and update 'git log --decorate=' optionssg/complete-decorate-full-not-long | SZEDER Gábor | 2015-05-03 | 1 | -1/+1 |
* | | | | | | Merge branch 'mh/multimail-renewal' | Junio C Hamano | 2015-04-28 | 2 | -24/+25 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Update git-multimail to version 1.0.2mh/multimail-renewal | Michael Haggerty | 2015-04-28 | 2 | -24/+25 |
| | |_|/ / / | |/| | | | | |||||
| * | | | | | Merge branch 'ma/bash-completion-leaking-x' into maint | Junio C Hamano | 2015-04-27 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'jk/colors' into maint | Junio C Hamano | 2015-04-21 | 1 | -2/+7 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'sg/completion-gitcomp-nl-for-refs' into maint | Junio C Hamano | 2015-03-28 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'ct/prompt-untracked-fix' into maint | Junio C Hamano | 2015-03-28 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'js/completion-ctags-pattern-substitution-fix' into maint | Junio C Hamano | 2015-03-27 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'sg/completion-remote' into maint | Junio C Hamano | 2015-03-23 | 1 | -5/+2 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'mg/doc-status-color-slot' into maint | Junio C Hamano | 2015-03-23 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ma/bash-completion-leaking-x' | Junio C Hamano | 2015-04-20 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | completion: fix global bash variable leak on __gitcompappendma/bash-completion-leaking-x | Márcio Almada | 2015-04-12 | 1 | -1/+1 |
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'jk/colors' | Junio C Hamano | 2015-04-14 | 1 | -2/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | diff-highlight: do not split multibyte charactersjk/colors | Kyle J. McKay | 2015-04-04 | 1 | -2/+7 |
* | | | | | | | | | | | | Merge branch 'sg/completion-gitcomp-nl-for-refs' | Junio C Hamano | 2015-03-26 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | completion: use __gitcomp_nl() for completing refssg/completion-gitcomp-nl-for-refs | SZEDER Gábor | 2015-03-22 | 1 | -2/+2 |
| | |_|/ / / / / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'av/wincred-with-at-in-username-fix' into maint | Junio C Hamano | 2015-03-05 | 1 | -3/+22 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ | Merge branch 'ct/prompt-untracked-fix' | Junio C Hamano | 2015-03-25 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | git prompt: use toplevel to find untracked filesct/prompt-untracked-fix | Cody A Taylor | 2015-03-15 | 1 | -1/+1 |
| | |_|_|/ / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'js/completion-ctags-pattern-substitution-fix' | Junio C Hamano | 2015-03-23 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | | |