summaryrefslogtreecommitdiff
path: root/contrib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'nd/worktree-lock'Junio C Hamano2016-07-281-1/+4
|\
| * worktree: add "unlock" commandNguyễn Thái Ngọc Duy2016-07-081-1/+1
| * worktree: add "lock" commandNguyễn Thái Ngọc Duy2016-07-081-1/+4
* | Merge branch 'bc/cocci'Junio C Hamano2016-07-192-0/+97
|\ \
| * | contrib/coccinelle: add basic Coccinelle transformsbrian m. carlson2016-06-282-0/+97
* | | Merge branch 'nd/worktree-cleanup-post-head-protection'Junio C Hamano2016-07-061-0/+23
|\ \ \ | | |/ | |/|
| * | completion: support git-worktreeNguyễn Thái Ngọc Duy2016-05-241-0/+23
* | | Merge branch 'tb/complete-status'Junio C Hamano2016-06-271-1/+97
|\ \ \
| * | | completion: add git statustb/complete-statusThomas Braun2016-06-101-0/+50
| * | | completion: add __git_get_option_value helperThomas Braun2016-06-101-0/+44
| * | | completion: factor out untracked file modes into a variableThomas Braun2016-06-101-1/+3
* | | | Merge branch 'nb/gnome-keyring-build'Junio C Hamano2016-06-271-2/+3
|\ \ \ \
| * | | | gnome-keyring: Don't hard-code pkg-config executablenb/gnome-keyring-buildHeiko Becker2016-06-141-2/+3
* | | | | Merge branch 'vs/prompt-avoid-unset-variable'Junio C Hamano2016-06-271-3/+3
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | git-prompt.sh: Don't error on null ${ZSH,BASH}_VERSION, $short_shavs/prompt-avoid-unset-variableVille Skyttä2016-06-061-3/+3
* | | | | git-multimail: update to release 1.3.1Matthieu Moy2016-05-134-4/+20
* | | | | Sync with maintJunio C Hamano2016-05-038-143/+476
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | git-multimail: update to release 1.3.0Matthieu Moy2016-05-038-143/+476
| | |_|/ | |/| |
* | | | Merge branch 'mg/complete-cherry-mark-to-log'Junio C Hamano2016-04-131-0/+1
|\ \ \ \
| * | | | completion: complete --cherry-mark for git logmg/complete-cherry-mark-to-logMichael J Gruber2016-04-051-0/+1
| | |_|/ | |/| |
* | | | Merge branch 'rt/completion-help'Junio C Hamano2016-04-131-3/+3
|\ \ \ \ | |_|/ / |/| | |
| * | | completion: add 'revisions' and 'everyday' to 'git help'rt/completion-helpRalf Thielow2016-03-241-2/+2
| * | | completion: add option '--guides' to 'git help'Ralf Thielow2016-03-241-1/+1
| * | | Merge branch 'pw/completion-stash' into maintJunio C Hamano2016-02-221-2/+2
| |\ \ \
| * \ \ \ Merge branch 'tb/complete-word-diff-regex' into maintJunio C Hamano2016-02-051-1/+1
| |\ \ \ \
| * \ \ \ \ Merge branch 'pw/completion-stash' into maintJunio C Hamano2016-02-051-3/+14
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'pw/completion-show-branch' into maintJunio C Hamano2016-02-051-1/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jk/completion-rebase' into maintJunio C Hamano2016-02-051-2/+6
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'dw/subtree-split-do-not-drop-merge' into maintJunio C Hamano2016-02-052-2/+70
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge branch 'pw/completion-stash'Junio C Hamano2016-02-221-2/+2
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| * | | | | | | | | completion: fix mis-indentation in _git_stash()pw/completion-stashSZEDER Gábor2016-02-221-2/+2
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'cc/untracked'Junio C Hamano2016-02-101-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | config: add core.untrackedCacheChristian Couder2016-01-271-0/+1
* | | | | | | | | | Merge branch 'pw/completion-stash'Junio C Hamano2016-02-031-3/+14
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | completion: update completion arguments for stashPaul Wagland2016-01-261-3/+14
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'pw/completion-show-branch'Junio C Hamano2016-02-031-1/+1
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | completion: complete show-branch "--date-order"pw/completion-show-branchPaul Wagland2016-01-251-1/+1
| |/ / / / / / /
* | | | | | | | Merge branch 'jk/completion-rebase'Junio C Hamano2016-02-031-2/+6
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | completion: add missing git-rebase optionsjk/completion-rebaseJohn Keeping2016-01-251-2/+6
| |/ / / / / /
* | | | | | | Merge branch 'dw/subtree-split-do-not-drop-merge'Junio C Hamano2016-02-032-2/+70
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | contrib/subtree: fix "subtree split" skipped-merge bugdw/subtree-split-do-not-drop-mergeDave Ware2016-01-202-2/+70
* | | | | | | Merge branch 'tb/complete-word-diff-regex'Junio C Hamano2016-02-031-1/+1
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | completion: complete "diff --word-diff-regex="tb/complete-word-diff-regexThomas Braun2016-01-201-1/+1
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'dg/subtree-test'Junio C Hamano2016-02-031-1/+5
|\ \ \ \ \ \
| * | | | | | contrib/subtree: Make testing easierdg/subtree-testDavid A. Greene2016-01-191-1/+5
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'js/pull-rebase-i'Junio C Hamano2016-01-261-1/+1
|\ \ \ \ \ \
| * | | | | | completion: add missing branch.*.rebase valuesjs/pull-rebase-iJohannes Schindelin2016-01-131-1/+1
| |/ / / / /
* | | | | | Merge branch 'ep/shell-command-substitution-style'Junio C Hamano2016-01-226-16/+16
|\ \ \ \ \ \
| * | | | | | contrib/thunderbird-patch-inline/appp.sh: use the $( ... ) construct for comm...Elia Pinto2015-12-271-2/+2
| * | | | | | contrib/examples/git-revert.sh: use the $( ... ) construct for command substi...Elia Pinto2015-12-271-4/+4