summaryrefslogtreecommitdiff
path: root/contrib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'so/prompt-command'Junio C Hamano2012-11-211-8/+90
|\
| * coloured git-prompt: paint detached HEAD marker in redJunio C Hamano2012-10-171-1/+1
| * Fix up colored git-promptSimon Oosthoek2012-10-161-23/+32
| * show color hints based on state of the git treeSimon Oosthoek2012-10-111-1/+35
| * Allow __git_ps1 to be used in PROMPT_COMMANDSimon Oosthoek2012-10-111-6/+45
* | Merge branch 'fc/completion-send-email-with-format-patch'Jeff King2012-11-091-17/+18
|\ \
| * | completion: add format-patch options to send-emailFelipe Contreras2012-10-161-17/+18
* | | Merge branch 'fa/remote-svn'Jeff King2012-10-252-1/+55
|\ \ \ | |/ / |/| |
| * | Add a svnrdump-simulator replaying a dump file for testingFlorian Achleitner2012-10-071-0/+53
| * | remote-svn: add incremental importFlorian Achleitner2012-10-071-1/+2
| * | remote-svn, vcs-svn: Enable fetching to private refsFlorian Achleitner2012-10-071-1/+1
* | | Merge branch 'maint'Junio C Hamano2012-10-131-1/+1
|\ \ \ | |_|/ |/| |
| * | Fix spelling error in post-receive-email hookRichard Fearn2012-10-131-1/+1
* | | Merge branch 'maint'Junio C Hamano2012-09-251-8/+1
|\ \ \ | |/ /
| * | Revert "completion: fix shell expansion of items"Jeff King2012-09-251-8/+1
* | | Sync with maintJunio C Hamano2012-09-241-3/+4
|\ \ \ | |/ /
| * | Improve the description of GIT_PS1_SHOWUPSTREAMJonathan "Duke" Leto2012-09-241-3/+4
* | | Merge branch 'maint'Junio C Hamano2012-09-201-1/+8
|\ \ \ | |/ /
| * | Merge branch 'nd/maint-remote-remove' into maintJunio C Hamano2012-09-201-2/+2
| |\ \
| * | | completion: fix shell expansion of itemsFelipe Contreras2012-09-201-1/+8
* | | | Merge branch 'maint'Junio C Hamano2012-09-172-3/+4
|\ \ \ \ | |/ / /
| * | | git-jump: ignore (custom) prefix in diff modeMischa POSLAWSKY2012-09-171-2/+2
| * | | completion: add --no-edit to git-commitYacine Belkadi2012-09-161-1/+2
* | | | Merge branch 'cn/branch-set-upstream-to'Junio C Hamano2012-09-141-1/+5
|\ \ \ \
| * | | | completion: complete branch name for "branch --set-upstream-to="Michael J Gruber2012-09-111-0/+3
| * | | | completion: add --set-upstream-to and --unset-upstreamCarlos Martín Nieto2012-09-111-1/+2
| | |_|/ | |/| |
* | | | Merge branch 'nd/maint-remote-remove'Junio C Hamano2012-09-121-2/+2
|\ \ \ \ | | |_|/ | |/| |
| * | | remote: prefer subcommand name 'remove' to 'rm'Nguyễn Thái Ngọc Duy2012-09-061-2/+2
| | |/ | |/|
* | | Merge branch 'jc/merge-bases'Junio C Hamano2012-09-111-1/+1
|\ \ \
| * | | in_merge_bases(): support only one "other" commitJunio C Hamano2012-08-271-1/+1
* | | | Merge branch 'ph/credential-gnome-keyring'Junio C Hamano2012-09-103-0/+470
|\ \ \ \
| * | | | contrib: add credential helper for GnomeKeyringPhilipp A. Hartmann2012-08-243-0/+470
| | |_|/ | |/| |
* | | | Merge branch 'ef/win32-cred-helper'Junio C Hamano2012-08-292-0/+371
|\ \ \ \
| * | | | contrib: add win32 credential-helperErik Faye-Lund2012-08-162-0/+371
| |/ / /
* | | | Merge branch 'da/difftool-updates'Junio C Hamano2012-08-271-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Add Code Compare v2.80.4 as a merge / diff tool for WindowsSebastian Schuberth2012-08-101-1/+1
* | | | Merge branch 'maint-1.7.11' into maintJunio C Hamano2012-08-244-23/+106
|\ \ \ \
| * | | | Make the ciabot scripts completely self-configuring in the normal case.Eric S. Raymond2012-08-234-37/+72
| * | | | Improved documentation for the ciabot scripts.Eric S. Raymond2012-08-232-2/+50
* | | | | Merge branch 'maint-1.7.11' into maintJunio C Hamano2012-08-222-118/+156
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | |
| * | | contrib/ciabot: Get ciabot configuration from git variablesEric S. Raymond2012-08-222-118/+156
| * | | Merge branch 'lm/git-blame-el' into maintJunio C Hamano2012-08-061-36/+37
| |\ \ \
| * \ \ \ Merge branch 'rs/git-blame-mapcar-mapc' into maintJunio C Hamano2012-08-061-1/+1
| |\ \ \ \ | | |_|/ / | |/| | |
* | | | | git-remote-mediawiki: replace TODO-list in comment by appropriate linkMatthieu Moy2012-08-031-14/+1
* | | | | Merge branch 'jk/mediawiki-credential'Junio C Hamano2012-07-231-28/+4
|\ \ \ \ \
| * | | | | mw-to-git: use git-credential's URL parserJeff King2012-07-181-28/+4
| * | | | | mw-to-git: check blank credential attributes via lengthJeff King2012-07-181-1/+1
* | | | | | git-remote-mediawiki: allow page names with a ':'Matthieu Moy2012-07-172-16/+53
* | | | | | git-remote-mediawiki: fix incorrect test usage in testMatthieu Moy2012-07-171-1/+1
* | | | | | git-remote-mediawiki: properly deal with invalid remote revisionsMatthieu Moy2012-07-161-4/+9