summaryrefslogtreecommitdiffstats
path: root/contrib
AgeCommit message (Expand)AuthorLines
2016-02-22Merge branch 'pw/completion-stash' into maintJunio C Hamano-2/+2
2016-02-22completion: fix mis-indentation in _git_stash()SZEDER Gábor-2/+2
2016-02-05Merge branch 'tb/complete-word-diff-regex' into maintJunio C Hamano-1/+1
2016-02-05Merge branch 'pw/completion-stash' into maintJunio C Hamano-3/+14
2016-02-05Merge branch 'pw/completion-show-branch' into maintJunio C Hamano-1/+1
2016-02-05Merge branch 'jk/completion-rebase' into maintJunio C Hamano-2/+6
2016-02-05Merge branch 'dw/subtree-split-do-not-drop-merge' into maintJunio C Hamano-2/+70
2016-01-26completion: update completion arguments for stashPaul Wagland-3/+14
2016-01-25completion: complete show-branch "--date-order"Paul Wagland-1/+1
2016-01-25completion: add missing git-rebase optionsJohn Keeping-2/+6
2016-01-20completion: complete "diff --word-diff-regex="Thomas Braun-1/+1
2016-01-20contrib/subtree: fix "subtree split" skipped-merge bugDave Ware-2/+70
2015-12-21Merge branch 'sg/completion-no-column'Junio C Hamano-0/+1
2015-12-15Merge branch 'jk/send-email-complete-aliases'Junio C Hamano-1/+1
2015-12-14completion: fix completing unstuck email alias argumentsSZEDER Gábor-1/+1
2015-12-11completion: remove 'git column' from porcelain commandsSZEDER Gábor-0/+1
2015-12-04Merge branch 'sg/bash-prompt-dirty-orphan'Junio C Hamano-4/+3
2015-12-04Merge branch 'jk/send-email-complete-aliases'Junio C Hamano-0/+16
2015-12-01Merge branch 'dg/subtree-test-cleanup'Jeff King-443/+956
2015-12-01Merge branch 'maint'Jeff King-1/+1
2015-11-24Merge branch 'fp/subtree-todo-update'Jeff King-2/+0
2015-11-24bash prompt: indicate dirty index even on orphan branchesSZEDER Gábor-3/+2
2015-11-24bash prompt: remove a redundant 'git diff' optionSZEDER Gábor-1/+1
2015-11-20completion: add support for completing email aliasesJacob Keller-0/+16
2015-11-20Escape Git's exec path in contrib/rerere-train.sh scriptDaniel Knittl-Frank-1/+1
2015-11-13contrib/subtree: Handle '--prefix' argument with a slash appendedTechlive Zheng-1/+21
2015-11-13contrib/subtree: Make each test self-containedTechlive Zheng-418/+840
2015-11-13contrib/subtree: Add split testsTechlive Zheng-2/+15
2015-11-13contrib/subtree: Add merge testsTechlive Zheng-1/+12
2015-11-13contrib/subtree: Add tests for subtree addTechlive Zheng-0/+19
2015-11-13contrib/subtree: Add test for missing subtreeTechlive Zheng-0/+4
2015-11-13contrib/subtree: Clean and refactor test codeTechlive Zheng-55/+79
2015-11-06contrib/subtree: remove "push" command from the "todo" fileFabio Porcedda-2/+0
2015-10-16Merge branch 'pt/pull-builtin' into maintJunio C Hamano-1/+1
2015-10-14Merge branch 'pt/pull-builtin'Junio C Hamano-1/+1
2015-10-12git-multimail: update to release 1.2.0Matthieu Moy-226/+1218
2015-10-05Merge branch 'as/subtree-with-spaces'Junio C Hamano-74/+124
2015-10-02merge: grammofix in please-commit-before-merge messageAlex Henrie-1/+1
2015-09-14Merge branch 'js/maint-am-skip-performance-regression'Junio C Hamano-1/+1
2015-09-08contrib/subtree: respect spaces in a repository pathAlexey Shumkin-1/+48
2015-09-08t7900-subtree: test the "space in a subdirectory name" caseAlexey Shumkin-73/+76
2015-08-31Merge branch 'sg/config-name-only'Junio C Hamano-12/+4
2015-08-26Merge branch 'ep/http-configure-ssl-version'Junio C Hamano-0/+1
2015-08-25Sync with maintJunio C Hamano-1/+1
2015-08-19Merge branch 'tb/complete-rebase-i-edit-todo'Junio C Hamano-1/+4
2015-08-19Merge branch 'jk/git-path'Junio C Hamano-2/+2
2015-08-19Merge branch 'mm/pull-upload-pack'Junio C Hamano-1/+1
2015-08-19Merge branch 'da/subtree-date-confusion' into maintJunio C Hamano-1/+5
2015-08-17http: add support for specifying the SSL versionElia Pinto-0/+1
2015-08-12Merge branch 'pt/am-builtin'Junio C Hamano-0/+975