Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'so/prompt-command' | Junio C Hamano | 2012-11-21 | 1 | -8/+90 |
|\ | |||||
| * | coloured git-prompt: paint detached HEAD marker in red | Junio C Hamano | 2012-10-17 | 1 | -1/+1 |
| * | Fix up colored git-prompt | Simon Oosthoek | 2012-10-16 | 1 | -23/+32 |
| * | show color hints based on state of the git tree | Simon Oosthoek | 2012-10-11 | 1 | -1/+35 |
| * | Allow __git_ps1 to be used in PROMPT_COMMAND | Simon Oosthoek | 2012-10-11 | 1 | -6/+45 |
* | | Merge branch 'fc/completion-send-email-with-format-patch' | Jeff King | 2012-11-09 | 1 | -17/+18 |
|\ \ | |||||
| * | | completion: add format-patch options to send-email | Felipe Contreras | 2012-10-16 | 1 | -17/+18 |
* | | | Merge branch 'fa/remote-svn' | Jeff King | 2012-10-25 | 2 | -1/+55 |
|\ \ \ | |/ / |/| | | |||||
| * | | Add a svnrdump-simulator replaying a dump file for testing | Florian Achleitner | 2012-10-07 | 1 | -0/+53 |
| * | | remote-svn: add incremental import | Florian Achleitner | 2012-10-07 | 1 | -1/+2 |
| * | | remote-svn, vcs-svn: Enable fetching to private refs | Florian Achleitner | 2012-10-07 | 1 | -1/+1 |
* | | | Merge branch 'maint' | Junio C Hamano | 2012-10-13 | 1 | -1/+1 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Fix spelling error in post-receive-email hook | Richard Fearn | 2012-10-13 | 1 | -1/+1 |
* | | | Merge branch 'maint' | Junio C Hamano | 2012-09-25 | 1 | -8/+1 |
|\ \ \ | |/ / | |||||
| * | | Revert "completion: fix shell expansion of items" | Jeff King | 2012-09-25 | 1 | -8/+1 |
* | | | Sync with maint | Junio C Hamano | 2012-09-24 | 1 | -3/+4 |
|\ \ \ | |/ / | |||||
| * | | Improve the description of GIT_PS1_SHOWUPSTREAM | Jonathan "Duke" Leto | 2012-09-24 | 1 | -3/+4 |
* | | | Merge branch 'maint' | Junio C Hamano | 2012-09-20 | 1 | -1/+8 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'nd/maint-remote-remove' into maint | Junio C Hamano | 2012-09-20 | 1 | -2/+2 |
| |\ \ | |||||
| * | | | completion: fix shell expansion of items | Felipe Contreras | 2012-09-20 | 1 | -1/+8 |
* | | | | Merge branch 'maint' | Junio C Hamano | 2012-09-17 | 2 | -3/+4 |
|\ \ \ \ | |/ / / | |||||
| * | | | git-jump: ignore (custom) prefix in diff mode | Mischa POSLAWSKY | 2012-09-17 | 1 | -2/+2 |
| * | | | completion: add --no-edit to git-commit | Yacine Belkadi | 2012-09-16 | 1 | -1/+2 |
* | | | | Merge branch 'cn/branch-set-upstream-to' | Junio C Hamano | 2012-09-14 | 1 | -1/+5 |
|\ \ \ \ | |||||
| * | | | | completion: complete branch name for "branch --set-upstream-to=" | Michael J Gruber | 2012-09-11 | 1 | -0/+3 |
| * | | | | completion: add --set-upstream-to and --unset-upstream | Carlos Martín Nieto | 2012-09-11 | 1 | -1/+2 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'nd/maint-remote-remove' | Junio C Hamano | 2012-09-12 | 1 | -2/+2 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | remote: prefer subcommand name 'remove' to 'rm' | Nguyễn Thái Ngọc Duy | 2012-09-06 | 1 | -2/+2 |
| | |/ | |/| | |||||
* | | | Merge branch 'jc/merge-bases' | Junio C Hamano | 2012-09-11 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | in_merge_bases(): support only one "other" commit | Junio C Hamano | 2012-08-27 | 1 | -1/+1 |
* | | | | Merge branch 'ph/credential-gnome-keyring' | Junio C Hamano | 2012-09-10 | 3 | -0/+470 |
|\ \ \ \ | |||||
| * | | | | contrib: add credential helper for GnomeKeyring | Philipp A. Hartmann | 2012-08-24 | 3 | -0/+470 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'ef/win32-cred-helper' | Junio C Hamano | 2012-08-29 | 2 | -0/+371 |
|\ \ \ \ | |||||
| * | | | | contrib: add win32 credential-helper | Erik Faye-Lund | 2012-08-16 | 2 | -0/+371 |
| |/ / / | |||||
* | | | | Merge branch 'da/difftool-updates' | Junio C Hamano | 2012-08-27 | 1 | -1/+1 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Add Code Compare v2.80.4 as a merge / diff tool for Windows | Sebastian Schuberth | 2012-08-10 | 1 | -1/+1 |
* | | | | Merge branch 'maint-1.7.11' into maint | Junio C Hamano | 2012-08-24 | 4 | -23/+106 |
|\ \ \ \ | |||||
| * | | | | Make the ciabot scripts completely self-configuring in the normal case. | Eric S. Raymond | 2012-08-23 | 4 | -37/+72 |
| * | | | | Improved documentation for the ciabot scripts. | Eric S. Raymond | 2012-08-23 | 2 | -2/+50 |
* | | | | | Merge branch 'maint-1.7.11' into maint | Junio C Hamano | 2012-08-22 | 2 | -118/+156 |
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | | | |||||
| * | | | contrib/ciabot: Get ciabot configuration from git variables | Eric S. Raymond | 2012-08-22 | 2 | -118/+156 |
| * | | | Merge branch 'lm/git-blame-el' into maint | Junio C Hamano | 2012-08-06 | 1 | -36/+37 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'rs/git-blame-mapcar-mapc' into maint | Junio C Hamano | 2012-08-06 | 1 | -1/+1 |
| |\ \ \ \ | | |_|/ / | |/| | | | |||||
* | | | | | git-remote-mediawiki: replace TODO-list in comment by appropriate link | Matthieu Moy | 2012-08-03 | 1 | -14/+1 |
* | | | | | Merge branch 'jk/mediawiki-credential' | Junio C Hamano | 2012-07-23 | 1 | -28/+4 |
|\ \ \ \ \ | |||||
| * | | | | | mw-to-git: use git-credential's URL parser | Jeff King | 2012-07-18 | 1 | -28/+4 |
| * | | | | | mw-to-git: check blank credential attributes via length | Jeff King | 2012-07-18 | 1 | -1/+1 |
* | | | | | | git-remote-mediawiki: allow page names with a ':' | Matthieu Moy | 2012-07-17 | 2 | -16/+53 |
* | | | | | | git-remote-mediawiki: fix incorrect test usage in test | Matthieu Moy | 2012-07-17 | 1 | -1/+1 |
* | | | | | | git-remote-mediawiki: properly deal with invalid remote revisions | Matthieu Moy | 2012-07-16 | 1 | -4/+9 |