summaryrefslogtreecommitdiff
path: root/contrib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'pw/p4-docs-and-tests'Junio C Hamano2012-01-032-305/+29
|\
| * git-p4: document and test submit optionspw/p4-docs-and-testsPete Wyckoff2011-12-271-0/+7
| * git-p4: test and document --use-client-specPete Wyckoff2011-12-271-1/+5
| * git-p4: honor --changesfile option and testPete Wyckoff2011-12-271-1/+15
| * git-p4: clone does not use --git-dirPete Wyckoff2011-12-271-1/+2
| * git-p4: introduce asciidoc documentationPete Wyckoff2011-12-271-302/+0
* | Merge branch 'tr/bash-read-unescaped'Junio C Hamano2011-12-221-6/+6
|\ \
| * | bash completion: use read -r everywheretr/bash-read-unescapedThomas Rast2011-12-211-6/+6
| |/
* | Merge branch 'jk/git-prompt'Junio C Hamano2011-12-223-0/+188
|\ \ | |/ |/|
| * contrib: add credential helper for OS X Keychainjk/git-promptJeff King2011-12-123-0/+188
* | git-p4: fix skipSubmitEdit regressionPete Wyckoff2011-12-171-7/+11
* | git-p4: use absolute directory for PWD env varGary Gibbons2011-12-111-2/+3
* | git-p4: ensure submit clientPath exists before chdirGary Gibbons2011-12-111-0/+4
* | Merge branch 'sg/complete-refs'Junio C Hamano2011-12-091-91/+110
|\ \
| * | completion: remove broken dead code from __git_heads() and __git_tags()sg/complete-refsSZEDER Gábor2011-10-211-20/+2
| * | completion: fast initial completion for config 'remote.*.fetch' valueSZEDER Gábor2011-10-211-0/+4
| * | completion: improve ls-remote output filtering in __git_refs_remotes()SZEDER Gábor2011-10-211-9/+4
| * | completion: query only refs/heads/ in __git_refs_remotes()SZEDER Gábor2011-10-211-8/+5
| * | completion: support full refs from remote repositoriesSZEDER Gábor2011-10-211-8/+21
| * | completion: improve ls-remote output filtering in __git_refs()SZEDER Gábor2011-10-211-7/+7
| * | completion: make refs completion consistent for local and remote reposSZEDER Gábor2011-10-211-4/+2
| * | completion: optimize refs completionSZEDER Gábor2011-10-211-45/+70
| * | completion: document __gitcomp()SZEDER Gábor2011-10-211-2/+7
* | | git-p4: introduce skipSubmitEditPete Wyckoff2011-12-052-24/+54
| |/ |/|
* | Merge branch 'sn/complete-bash-wo-process-subst'Junio C Hamano2011-11-091-1/+1
|\ \
| * | completion: don't leak variable from the prompt into environmentSZEDER Gábor2011-11-091-1/+1
* | | Merge branch 'pw/p4-appledouble-fix'Junio C Hamano2011-11-061-0/+13
|\ \ \
| * | | git-p4: ignore apple filetypePete Wyckoff2011-11-051-0/+13
* | | | Merge branch 'jk/git-tricks'Junio C Hamano2011-10-305-0/+355
|\ \ \ \
| * | | | completion: match ctags symbol names in grep patternsJeff King2011-10-211-0/+13
| * | | | contrib: add git-jump scriptJeff King2011-10-212-0/+161
| * | | | contrib: add diff highlight scriptJeff King2011-10-182-0/+181
| | |_|/ | |/| |
* | | | Merge branch 'sn/complete-bash-wo-process-subst'Junio C Hamano2011-10-271-1/+2
|\ \ \ \ | | |_|/ | |/| |
| * | | completion: fix issue with process substitution not working on Git for WindowsStefan Naewe2011-10-261-1/+2
* | | | Merge branch 'mm/mediawiki-author-fix'Junio C Hamano2011-10-261-0/+4
|\ \ \ \ | |/ / / |/| | |
| * | | git-remote-mediawiki: don't include HTTP login/password in authorMatthieu Moy2011-10-201-0/+4
* | | | Merge branch 'pw/p4-update'Junio C Hamano2011-10-211-99/+188
|\ \ \ \ | |_|/ / |/| | |
| * | | git-p4: handle files with shell metacharactersLuke Diamand2011-10-171-77/+123
| * | | git-p4: keyword flattening fixesPete Wyckoff2011-10-171-2/+6
| | |/ | |/|
| * | git-p4: stop ignoring apple filetypePete Wyckoff2011-10-171-5/+0
| * | git-p4: recognize all p4 filetypesPete Wyckoff2011-10-171-19/+52
| * | git-p4: handle utf16 filetype properlyPete Wyckoff2011-10-171-0/+11
* | | Merge branch 'sg/completion'Junio C Hamano2011-10-171-18/+6
|\ \ \
| * | | completion: unite --format and --pretty for 'log' and 'show'SZEDER Gábor2011-10-101-14/+4
| * | | completion: unite --reuse-message and --reedit-message for 'notes'SZEDER Gábor2011-10-101-4/+2
* | | | Merge branch 'tm/completion-push-set-upstream'Junio C Hamano2011-10-171-1/+1
|\ \ \ \
| * | | | completion: push --set-upstreamtm/completion-push-set-upstreamTeemu Matilainen2011-10-061-1/+1
* | | | | Merge branch 'tm/completion-commit-fixup-squash'Junio C Hamano2011-10-171-7/+4
|\ \ \ \ \ | | |/ / / | |/| / / | |_|/ / |/| | |
| * | | completion: commit --fixup and --squashtm/completion-commit-fixup-squashTeemu Matilainen2011-10-061-2/+3
| * | | completion: unite --reuse-message and --reedit-message handlingTeemu Matilainen2011-10-061-6/+2
| |/ /
View Lorry Controller Status