summaryrefslogtreecommitdiff
path: root/contrib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'vs/typofix'Junio C Hamano2016-08-124-5/+5
|\
| * Spelling fixesvs/typofixVille Skyttä2016-08-114-5/+5
* | Merge branch 'js/import-tars-hardlinks'Junio C Hamano2016-08-121-11/+20
|\ \
| * | import-tars: support hard linksjs/import-tars-hardlinksJohannes Schindelin2016-08-031-11/+20
* | | Merge branch 'vs/completion-branch-fully-spelled-d-m-r'Junio C Hamano2016-08-121-3/+3
|\ \ \
| * | | completion: complete --delete, --move, and --remotes for git branchvs/completion-branch-fully-spelled-d-m-rVille Skyttä2016-08-091-3/+3
* | | | Merge branch 'jk/completion-diff-submodule'Junio C Hamano2016-08-101-0/+19
|\ \ \ \
| * | | | completion: add completion for --submodule=* diff optionjk/completion-diff-submoduleJacob Keller2016-08-091-0/+19
| |/ / /
* | | | Merge branch 'jt/format-patch-from-config'Junio C Hamano2016-08-101-0/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | format-patch: format.from gives the default for --fromjt/format-patch-from-configJosh Triplett2016-08-011-0/+1
| |/ /
| * | Merge branch 'nb/gnome-keyring-build' into maintJunio C Hamano2016-07-061-2/+3
| |\ \
| * \ \ Merge branch 'vs/prompt-avoid-unset-variable' into maintJunio C Hamano2016-07-061-3/+3
| |\ \ \
* | \ \ \ Merge branch 'cp/completion-clone-recurse-submodules'Junio C Hamano2016-08-081-0/+1
|\ \ \ \ \
| * | | | | completion: add option '--recurse-submodules' to 'git clone'cp/completion-clone-recurse-submodulesChris Packham2016-07-271-0/+1
| | |_|_|/ | |/| | |
* | | | | Merge branch 'da/subtree-modernize'Junio C Hamano2016-08-081-286/+391
|\ \ \ \ \
| * | | | | subtree: adjust function definitions to match CodingGuidelinesda/subtree-modernizeDavid Aguilar2016-07-271-68/+34
| * | | | | subtree: adjust style to match CodingGuidelinesDavid Aguilar2016-07-271-218/+357
* | | | | | Merge branch 'jk/git-jump'Junio C Hamano2016-08-032-3/+11
|\ \ \ \ \ \
| * | | | | | contrib/git-jump: fix typo in READMEjk/git-jumpJeff King2016-07-221-1/+1
| * | | | | | contrib/git-jump: add whitespace-checking modeJeff King2016-07-222-1/+9
| * | | | | | contrib/git-jump: fix greedy regex when matching hunksJeff King2016-07-221-1/+1
* | | | | | | Merge branch 'pm/build-persistent-https-with-recent-go'Junio C Hamano2016-08-031-2/+4
|\ \ \ \ \ \ \
| * | | | | | | contrib/persistent-https: use Git version for build labelpm/build-persistent-https-with-recent-goParker Moore2016-07-221-1/+1
| * | | | | | | contrib/persistent-https: update ldflags syntax for Go 1.7+Parker Moore2016-07-221-1/+3
| | |_|/ / / / | |/| | | | |
| * | | | | | Merge branch 'sg/completion-no-column' into maintJunio C Hamano2016-01-041-0/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'as/subtree-with-spaces' into maintJunio C Hamano2015-12-112-74/+124
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'sg/bash-prompt-dirty-orphan' into maintJunio C Hamano2015-12-081-4/+3
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge branch 'da/subtree-2.9-regression'Junio C Hamano2016-08-032-8/+25
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |
| * | | | | | | | | subtree: fix "git subtree split --rejoin"da/subtree-2.9-regressionDavid Aguilar2016-07-262-0/+17
| * | | | | | | | | t7900-subtree.sh: fix quoting and broken && chainsDavid Aguilar2016-07-261-8/+8
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | 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
| | |_|/ / / / / / | |/| | | | | | |