Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'sg/completion-no-column' | Junio C Hamano | 2015-12-21 | 1 | -0/+1 |
|\ | |||||
| * | completion: remove 'git column' from porcelain commandssg/completion-no-column | SZEDER Gábor | 2015-12-11 | 1 | -0/+1 |
* | | Merge branch 'jk/send-email-complete-aliases' | Junio C Hamano | 2015-12-15 | 1 | -1/+1 |
|\ \ | |||||
| * | | completion: fix completing unstuck email alias argumentsjk/send-email-complete-aliases | SZEDER Gábor | 2015-12-14 | 1 | -1/+1 |
* | | | Merge branch 'sg/bash-prompt-dirty-orphan' | Junio C Hamano | 2015-12-04 | 1 | -4/+3 |
|\ \ \ | |||||
| * | | | bash prompt: indicate dirty index even on orphan branchessg/bash-prompt-dirty-orphan | SZEDER Gábor | 2015-11-24 | 1 | -3/+2 |
| * | | | bash prompt: remove a redundant 'git diff' option | SZEDER Gábor | 2015-11-24 | 1 | -1/+1 |
* | | | | Merge branch 'jk/send-email-complete-aliases' | Junio C Hamano | 2015-12-04 | 1 | -0/+16 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | completion: add support for completing email aliases | Jacob Keller | 2015-11-20 | 1 | -0/+16 |
* | | | | Merge branch 'dg/subtree-test-cleanup' | Jeff King | 2015-12-01 | 3 | -443/+956 |
|\ \ \ \ | |||||
| * | | | | contrib/subtree: Handle '--prefix' argument with a slash appended | Techlive Zheng | 2015-11-13 | 2 | -1/+21 |
| * | | | | contrib/subtree: Make each test self-contained | Techlive Zheng | 2015-11-13 | 1 | -418/+840 |
| * | | | | contrib/subtree: Add split tests | Techlive Zheng | 2015-11-13 | 1 | -2/+15 |
| * | | | | contrib/subtree: Add merge tests | Techlive Zheng | 2015-11-13 | 1 | -1/+12 |
| * | | | | contrib/subtree: Add tests for subtree add | Techlive Zheng | 2015-11-13 | 1 | -0/+19 |
| * | | | | contrib/subtree: Add test for missing subtree | Techlive Zheng | 2015-11-13 | 1 | -0/+4 |
| * | | | | contrib/subtree: Clean and refactor test code | Techlive Zheng | 2015-11-13 | 2 | -55/+79 |
| |/ / / | |||||
* | | | | Merge branch 'maint' | Jeff King | 2015-12-01 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Escape Git's exec path in contrib/rerere-train.sh scriptdk/rerere-train-quoting | Daniel Knittl-Frank | 2015-11-20 | 1 | -1/+1 |
| | |/ / | |/| | | |||||
| * | | | Merge branch 'pt/pull-builtin' into maint | Junio C Hamano | 2015-10-16 | 1 | -1/+1 |
| |\ \ \ | |||||
* | \ \ \ | Merge branch 'fp/subtree-todo-update' | Jeff King | 2015-11-24 | 1 | -2/+0 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | contrib/subtree: remove "push" command from the "todo" filefp/subtree-todo-update | Fabio Porcedda | 2015-11-06 | 1 | -2/+0 |
* | | | | | Merge branch 'pt/pull-builtin' | Junio C Hamano | 2015-10-14 | 1 | -1/+1 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | merge: grammofix in please-commit-before-merge message | Alex Henrie | 2015-10-02 | 1 | -1/+1 |
* | | | | | git-multimail: update to release 1.2.0 | Matthieu Moy | 2015-10-12 | 9 | -226/+1218 |
| |/ / / |/| | | | |||||
* | | | | Merge branch 'as/subtree-with-spaces' | Junio C Hamano | 2015-10-05 | 2 | -74/+124 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | contrib/subtree: respect spaces in a repository pathas/subtree-with-spaces | Alexey Shumkin | 2015-09-08 | 2 | -1/+48 |
| * | | | t7900-subtree: test the "space in a subdirectory name" case | Alexey Shumkin | 2015-09-08 | 2 | -73/+76 |
* | | | | Merge branch 'js/maint-am-skip-performance-regression' | Junio C Hamano | 2015-09-14 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | |||||
| * | | Merge branch 'sg/completion-commit-cleanup' into maint | Junio C Hamano | 2015-08-03 | 1 | -1/+1 |
| |\ \ | |||||
* | \ \ | Merge branch 'sg/config-name-only' | Junio C Hamano | 2015-08-31 | 1 | -12/+4 |
|\ \ \ \ | |||||
| * | | | | completion: list variable names reliably with 'git config --name-only' | SZEDER Gábor | 2015-08-10 | 1 | -12/+3 |
| * | | | | config: add '--name-only' option to list only variable names | SZEDER Gábor | 2015-08-10 | 1 | -0/+1 |
* | | | | | Merge branch 'ep/http-configure-ssl-version' | Junio C Hamano | 2015-08-26 | 1 | -0/+1 |
|\ \ \ \ \ | |||||
| * | | | | | http: add support for specifying the SSL versionep/http-configure-ssl-version | Elia Pinto | 2015-08-17 | 1 | -0/+1 |
* | | | | | | Sync with maint | Junio C Hamano | 2015-08-25 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'da/subtree-date-confusion' into maint | Junio C Hamano | 2015-08-19 | 2 | -1/+5 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'tb/complete-rebase-i-edit-todo' | Junio C Hamano | 2015-08-19 | 1 | -1/+4 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | completion: offer '--edit-todo' during interactive rebasetb/complete-rebase-i-edit-todo | Thomas Braun | 2015-08-05 | 1 | -1/+4 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'jk/git-path' | Junio C Hamano | 2015-08-19 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | memoize common git-path "constant" filesjk/git-path | Jeff King | 2015-08-10 | 1 | -2/+2 |
* | | | | | | | | Merge branch 'mm/pull-upload-pack' | Junio C Hamano | 2015-08-19 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'pt/am-builtin' | Junio C Hamano | 2015-08-12 | 1 | -0/+975 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | builtin-am: remove redirection to git-am.sh | Paul Tan | 2015-08-04 | 1 | -0/+975 |
* | | | | | | | | Merge branch 'da/subtree-date-confusion' | Junio C Hamano | 2015-08-03 | 2 | -1/+5 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | / / / / | | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | contrib/subtree: ignore log.date configurationda/subtree-date-confusion | David Aguilar | 2015-07-23 | 2 | -1/+5 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch 'sg/bash-prompt-untracked-optim' | Junio C Hamano | 2015-08-03 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | bash prompt: faster untracked status indicator with untracked directoriessg/bash-prompt-untracked-optim | SZEDER Gábor | 2015-07-20 | 1 | -1/+1 |
| |/ / / / / | |||||
| * | | | | | Merge branch 'jc/prompt-document-ps1-state-separator' into maint | Junio C Hamano | 2015-07-15 | 1 | -0/+4 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'af/tcsh-completion-noclobber' into maint | Junio C Hamano | 2015-07-15 | 1 | -1/+1 |
| |\ \ \ \ \ \ |