summaryrefslogtreecommitdiff
path: root/contrib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rj/cygwin-clarify-use-of-cheating-lstat'Junio C Hamano2013-08-021-1/+0
|\
| * cygwin: Remove the Win32 l/stat() implementationrj/cygwin-clarify-use-of-cheating-lstatRamsay Jones2013-07-181-1/+0
* | Merge branch 'ob/typofixes'Junio C Hamano2013-08-013-4/+4
|\ \
| * | many small typofixesob/typofixesOndřej Bílka2013-07-293-4/+4
* | | Merge branch 'ms/subtree-install-fix'Junio C Hamano2013-08-011-0/+1
|\ \ \
| * | | contrib/subtree: Fix make install targetms/subtree-install-fixMichal Sojka2013-07-301-0/+1
* | | | Merge branch 'lf/echo-n-is-not-portable'Junio C Hamano2013-08-012-5/+5
|\ \ \ \
| * | | | Avoid using `echo -n` anywherelf/echo-n-is-not-portableLukas Fleischer2013-07-292-5/+5
* | | | | Merge branch 'ma/hg-to-git'Junio C Hamano2013-08-011-1/+1
|\ \ \ \ \
| * | | | | hg-to-git: --allow-empty-message in git commitma/hg-to-gitMaurício C Antunes2013-07-231-1/+1
| * | | | | Merge branch 'dm/unbash-subtree' into maintJunio C Hamano2013-07-031-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'fc/show-branch-in-rebase-am' into maintJunio C Hamano2013-06-271-0/+2
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'tg/maint-zsh-svn-remote-prompt' into maintJunio C Hamano2013-06-271-3/+4
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jk/subtree-do-not-push-if-split-fails' into maintJunio C Hamano2013-06-271-1/+2
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge branch 'bc/completion-for-bash-3.0'Junio C Hamano2013-07-301-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | |
| * | | | | | | | | git-completion.bash: replace zsh notation that breaks bash 3.XBrandon Casey2013-07-241-1/+1
* | | | | | | | | | Merge branch 'mh/multimail'Junio C Hamano2013-07-247-4/+3411
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | post-receive-email: deprecate script in favor of git-multimailMichael Haggerty2013-07-221-4/+13
| * | | | | | | | | | git-multimail: an improved replacement for post-receive-emailMichael Haggerty2013-07-156-0/+3398
* | | | | | | | | | | Merge branch 'es/contacts'Junio C Hamano2013-07-242-0/+282
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
| * | | | | | | | | | contrib: contacts: add documentationes/contactsEric Sunshine2013-07-211-0/+94
| * | | | | | | | | | contrib: contacts: add mailmap supportEric Sunshine2013-07-211-0/+18
| * | | | | | | | | | contrib: contacts: interpret committish akin to format-patchEric Sunshine2013-07-211-1/+18
| * | | | | | | | | | contrib: contacts: add ability to parse from committishEric Sunshine2013-07-211-6/+32
| * | | | | | | | | | contrib: add git-contacts helperEric Sunshine2013-07-211-0/+127
* | | | | | | | | | | Merge branch 'es/check-mailmap'Junio C Hamano2013-07-221-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | builtin: add git-check-mailmap commandEric Sunshine2013-07-131-0/+1
* | | | | | | | | | | Merge branch 'bp/mediawiki-preview'Junio C Hamano2013-07-186-82/+526
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| * | | | | | | | | | git-remote-mediawiki: add preview subcommand into git mwbp/mediawiki-previewBenoit Person2013-07-082-2/+311
| * | | | | | | | | | git-remote-mediawiki: add git-mw commandBenoit Person2013-07-082-3/+64
| * | | | | | | | | | git-remote-mediawiki: factoring code between git-remote-mediawiki and Git::Me...Benoit Person2013-07-082-73/+89
| * | | | | | | | | | git-remote-mediawiki: update tests to run with the new bin-wrapperBenoit Person2013-07-081-6/+2
| * | | | | | | | | | git-remote-mediawiki: add a git bin-wrapper for developementBenoit Person2013-07-082-0/+20
| * | | | | | | | | | git-remote-mediawiki: introduction of Git::Mediawiki.pmBenoit Person2013-07-082-3/+45
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'jk/bash-completion'Junio C Hamano2013-07-111-1/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | completion: learn about --man-pathJohn Keeping2013-06-301-0/+1
| * | | | | | | | | | completion: handle unstuck form of base git optionsJohn Keeping2013-06-301-1/+2
| |/ / / / / / / / /
* | | | | | | | | | git-remote-mediawiki: un-brace file handles in binmode callsMatthieu Moy2013-07-031-2/+2
* | | | | | | | | | Merge branch 'ed/color-prompt'Junio C Hamano2013-07-011-70/+41
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git-prompt.sh: add missing information in commentsEduardo R. D'Avila2013-06-261-11/+15
| * | | | | | | | | | git-prompt.sh: do not print duplicate clean color codeEduardo R. D'Avila2013-06-261-1/+1
| * | | | | | | | | | git-prompt.sh: refactor colored prompt codeEduardo R. D'Avila2013-06-261-59/+26
| |/ / / / / / / / /
* | | | | | | | | | bash prompt: mention that PROMPT_COMMAND mode is fasterSZEDER Gábor2013-06-241-5/+5
* | | | | | | | | | bash prompt: avoid command substitution when finalizing gitstringSZEDER Gábor2013-06-241-1/+5
* | | | | | | | | | bash prompt: avoid command substitution when checking for untracked filesSZEDER Gábor2013-06-241-1/+1
* | | | | | | | | | bash prompt: use bash builtins to check stash stateSZEDER Gábor2013-06-241-2/+3
* | | | | | | | | | bash prompt: use bash builtins to check for unborn branch for dirty stateSZEDER Gábor2013-06-241-1/+1
* | | | | | | | | | bash prompt: combine 'git rev-parse' for detached headSZEDER Gábor2013-06-241-4/+12
* | | | | | | | | | bash prompt: combine 'git rev-parse' executions in the main code pathSZEDER Gábor2013-06-241-5/+13
* | | | | | | | | | bash prompt: use bash builtins to find out current branchSZEDER Gábor2013-06-241-18/+33