summaryrefslogtreecommitdiff
path: root/contrib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'tb/complete-word-diff-regex' into maintJunio C Hamano2016-02-051-1/+1
|\
| * completion: complete "diff --word-diff-regex="tb/complete-word-diff-regexThomas Braun2016-01-201-1/+1
* | Merge branch 'pw/completion-stash' into maintJunio C Hamano2016-02-051-3/+14
|\ \
| * | completion: update completion arguments for stashPaul Wagland2016-01-261-3/+14
* | | Merge branch 'pw/completion-show-branch' into maintJunio C Hamano2016-02-051-1/+1
|\ \ \
| * | | completion: complete show-branch "--date-order"pw/completion-show-branchPaul Wagland2016-01-251-1/+1
| |/ /
* | | Merge branch 'jk/completion-rebase' into maintJunio C Hamano2016-02-051-2/+6
|\ \ \
| * | | completion: add missing git-rebase optionsjk/completion-rebaseJohn Keeping2016-01-251-2/+6
| |/ /
* | | Merge branch 'dw/subtree-split-do-not-drop-merge' into maintJunio C Hamano2016-02-052-2/+70
|\ \ \ | |/ / |/| |
| * | contrib/subtree: fix "subtree split" skipped-merge bugdw/subtree-split-do-not-drop-mergeDave Ware2016-01-202-2/+70
* | | Merge branch 'sg/completion-no-column'Junio C Hamano2015-12-211-0/+1
|\ \ \
| * | | completion: remove 'git column' from porcelain commandssg/completion-no-columnSZEDER Gábor2015-12-111-0/+1
* | | | Merge branch 'jk/send-email-complete-aliases'Junio C Hamano2015-12-151-1/+1
|\ \ \ \
| * | | | completion: fix completing unstuck email alias argumentsjk/send-email-complete-aliasesSZEDER Gábor2015-12-141-1/+1
* | | | | Merge branch 'sg/bash-prompt-dirty-orphan'Junio C Hamano2015-12-041-4/+3
|\ \ \ \ \
| * | | | | bash prompt: indicate dirty index even on orphan branchessg/bash-prompt-dirty-orphanSZEDER Gábor2015-11-241-3/+2
| * | | | | bash prompt: remove a redundant 'git diff' optionSZEDER Gábor2015-11-241-1/+1
* | | | | | Merge branch 'jk/send-email-complete-aliases'Junio C Hamano2015-12-041-0/+16
|\ \ \ \ \ \ | | |/ / / / | |/| | / / | |_|_|/ / |/| | | |
| * | | | completion: add support for completing email aliasesJacob Keller2015-11-201-0/+16
* | | | | Merge branch 'dg/subtree-test-cleanup'Jeff King2015-12-013-443/+956
|\ \ \ \ \
| * | | | | contrib/subtree: Handle '--prefix' argument with a slash appendedTechlive Zheng2015-11-132-1/+21
| * | | | | contrib/subtree: Make each test self-containedTechlive Zheng2015-11-131-418/+840
| * | | | | contrib/subtree: Add split testsTechlive Zheng2015-11-131-2/+15
| * | | | | contrib/subtree: Add merge testsTechlive Zheng2015-11-131-1/+12
| * | | | | contrib/subtree: Add tests for subtree addTechlive Zheng2015-11-131-0/+19
| * | | | | contrib/subtree: Add test for missing subtreeTechlive Zheng2015-11-131-0/+4
| * | | | | contrib/subtree: Clean and refactor test codeTechlive Zheng2015-11-132-55/+79
| |/ / / /
* | | | | Merge branch 'maint'Jeff King2015-12-011-1/+1
|\ \ \ \ \
| * | | | | Escape Git's exec path in contrib/rerere-train.sh scriptdk/rerere-train-quotingDaniel Knittl-Frank2015-11-201-1/+1
| | |/ / / | |/| | |
| * | | | Merge branch 'pt/pull-builtin' into maintJunio C Hamano2015-10-161-1/+1
| |\ \ \ \
* | \ \ \ \ Merge branch 'fp/subtree-todo-update'Jeff King2015-11-241-2/+0
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | contrib/subtree: remove "push" command from the "todo" filefp/subtree-todo-updateFabio Porcedda2015-11-061-2/+0
* | | | | | Merge branch 'pt/pull-builtin'Junio C Hamano2015-10-141-1/+1
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | merge: grammofix in please-commit-before-merge messageAlex Henrie2015-10-021-1/+1
* | | | | | git-multimail: update to release 1.2.0Matthieu Moy2015-10-129-226/+1218
| |/ / / / |/| | | |
* | | | | Merge branch 'as/subtree-with-spaces'Junio C Hamano2015-10-052-74/+124
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | contrib/subtree: respect spaces in a repository pathas/subtree-with-spacesAlexey Shumkin2015-09-082-1/+48
| * | | | t7900-subtree: test the "space in a subdirectory name" caseAlexey Shumkin2015-09-082-73/+76
* | | | | Merge branch 'js/maint-am-skip-performance-regression'Junio C Hamano2015-09-141-1/+1
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| |
| * | | Merge branch 'sg/completion-commit-cleanup' into maintJunio C Hamano2015-08-031-1/+1
| |\ \ \
* | \ \ \ 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
|\ \ \ \ \ \ \