summaryrefslogtreecommitdiff
path: root/contrib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fc/remote-helper-fixes'Junio C Hamano2013-12-273-9/+103
|\
| * remote-hg: test 'shared_path' in a moved cloneAntoine Pelisse2013-12-261-0/+11
| * remote-hg: add tests for special filenamesFelipe Contreras2013-12-091-0/+68
| * remote-hg: fix 'shared path' pathFelipe Contreras2013-12-091-0/+3
| * remote-helpers: add extra safety checksFelipe Contreras2013-12-092-8/+20
| * remote-hg: avoid buggy strftime()jcb912013-12-091-1/+1
* | Merge branch 'js/gnome-keyring'Junio C Hamano2013-12-271-46/+39
|\ \
| * | contrib/git-credential-gnome-keyring.c: small stylistic cleanupsjs/gnome-keyringJohn Szakmeister2013-12-161-46/+39
* | | Merge branch 'jn/scripts-updates'Junio C Hamano2013-12-1212-539/+0
|\ \ \
| * | | remove #!interpreter line from shell librariesjn/scripts-updatesJonathan Nieder2013-11-262-4/+0
| * | | contrib: remove git-p4importJonathan Nieder2013-11-263-533/+0
| * | | mark contributed hooks executableJonathan Nieder2013-11-254-2/+0
| * | | mark Windows build scripts executableJonathan Nieder2013-11-253-0/+0
| |/ /
* | | Merge branch 'jk/remove-deprecated'Junio C Hamano2013-12-122-6/+2
|\ \ \ | |_|/ |/| |
| * | Sync with 1.8.5jk/remove-deprecatedJunio C Hamano2013-12-051-1/+1
| |\ \ | | |/
| * | peek-remote: remove deprecated alias of ls-remoteJohn Keeping2013-11-121-1/+0
| * | lost-found: remove deprecated commandJohn Keeping2013-11-121-1/+0
| * | tar-tree: remove deprecated commandJohn Keeping2013-11-121-1/+0
| * | repo-config: remove deprecated alias for "git config"John Keeping2013-11-122-3/+2
* | | Merge branch 'rh/remote-hg-bzr-updates'Junio C Hamano2013-12-064-24/+25
|\ \ \
| * | | remote-bzr, remote-hg: fix email address regular expressionrh/remote-hg-bzr-updatesRichard Hansen2013-11-183-9/+8
| * | | test-hg.sh: help user correlate verbose output with email testRichard Hansen2013-11-181-10/+10
| * | | test-hg.sh: fix duplicate content strings in author testsRichard Hansen2013-11-181-9/+9
| * | | test-hg.sh: avoid obsolete 'test' syntaxRichard Hansen2013-11-181-1/+1
| * | | test-hg.sh: eliminate 'local' bashismRichard Hansen2013-11-181-2/+2
| * | | test-bzr.sh, test-hg.sh: prepare for change to push.default=simpleRichard Hansen2013-11-181-1/+1
| * | | test-bzr.sh, test-hg.sh: allow running from any dirFelipe Contreras2013-11-182-2/+4
| | |/ | |/|
* | | Merge branch 'jn/mediawiki-makefile-updates'Junio C Hamano2013-12-051-2/+7
|\ \ \
| * | | git-remote-mediawiki build: handle DESTDIR/INSTLIBDIR with whitespacejn/mediawiki-makefile-updatesJonathan Nieder2013-11-111-2/+4
| * | | git-remote-mediawiki build: make 'install' command configurableJonathan Nieder2013-11-111-2/+4
| * | | git-remote-mediawiki: honor DESTDIR in "make install"Jonathan Nieder2013-11-111-1/+3
| * | | git-remote-mediawiki: do not remove installed files in "clean" targetJonathan Nieder2013-11-111-1/+0
* | | | Merge branch 'mi/typofixes'Junio C Hamano2013-12-034-4/+4
|\ \ \ \ | |_|/ / |/| | |
| * | | contrib: typofixesmi/typofixesMasanari Iida2013-11-124-4/+4
| | |/ | |/|
* | | remote-hg: don't decode UTF-8 paths into Unicode objectsRichard Hansen2013-11-181-1/+1
|/ /
* | Merge branch 'jk/subtree-install-fix'Junio C Hamano2013-11-041-1/+6
|\ \
| * | subtree: add makefile target for html docsjk/subtree-install-fixJeff King2013-10-301-1/+6
* | | Merge branch 'ap/remote-hg-unquote-cquote'Junio C Hamano2013-11-011-0/+6
|\ \ \
| * | | remote-hg: unquote C-style paths when exportingap/remote-hg-unquote-cquoteAntoine Pelisse2013-10-231-0/+6
* | | | Merge branch 'sg/prompt-svn-remote-fix'Junio C Hamano2013-10-281-1/+1
|\ \ \ \
| * | | | bash prompt: don't use '+=' operator in show upstream code pathsg/prompt-svn-remote-fixSZEDER Gábor2013-10-151-1/+1
| |/ / /
* | | | Merge branch 'bc/gnome-keyring'Junio C Hamano2013-10-232-134/+167
|\ \ \ \
| * | | | contrib/git-credential-gnome-keyring.c: support really ancient gnome-keyringbc/gnome-keyringBrandon Casey2013-10-161-0/+39
| * | | | contrib/git-credential-gnome-keyring.c: support ancient gnome-keyringBrandon Casey2013-10-161-0/+58
| * | | | contrib/git-credential-gnome-keyring.c: report failure to store passwordBrandon Casey2013-10-161-1/+9
| * | | | contrib/git-credential-gnome-keyring.c: use glib messaging functionsBrandon Casey2013-10-161-29/+4
| * | | | contrib/git-credential-gnome-keyring.c: use glib memory allocation functionsBrandon Casey2013-10-161-32/+16
| * | | | contrib/git-credential-gnome-keyring.c: use secure memory for reading passwordsBrandon Casey2013-10-161-3/+9
| * | | | contrib/git-credential-gnome-keyring.c: use secure memory functions for passwdsBrandon Casey2013-10-161-15/+6
| * | | | contrib/git-credential-gnome-keyring.c: use gnome helpers in keyring_object()Brandon Casey2013-10-161-11/+3