summaryrefslogtreecommitdiff
path: root/contrib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname' into maintJunio C Hamano2014-05-281-17/+39
|\
| * git-prompt.sh: don't assume the shell expands the value of PS1rh/prompt-pcmode-avoid-eval-on-refnameRichard Hansen2014-05-191-17/+39
* | Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname' into maintJunio C Hamano2014-05-081-2/+32
|\ \ | |/
| * git-prompt.sh: don't put unsanitized branch names in $PS1Richard Hansen2014-04-221-2/+32
| * Merge branch 'mi/typofixes' into maintJunio C Hamano2013-12-174-4/+4
| |\
* | | comments: fix misuses of "nor"Justin Lebar2014-03-313-5/+5
* | | contrib: fix misuses of "nor"Justin Lebar2014-03-312-3/+3
* | | Merge branch 'jk/complete-merge-base'Junio C Hamano2014-01-271-1/+7
|\ \ \
| * | | completion: handle --[no-]fork-point options to git-rebasejk/complete-merge-baseJohn Keeping2014-01-131-1/+1
| * | | completion: complete merge-base optionsJohn Keeping2014-01-131-0/+6
* | | | Merge branch 'ab/subtree-doc'Junio C Hamano2014-01-272-13/+23
|\ \ \ \
| * | | | subtree: fix argument validation in add/pull/pushab/subtree-docAnthony Baire2014-01-132-13/+23
| | |/ / | |/| |
* | | | Merge branch 'rr/completion-format-coverletter'Junio C Hamano2014-01-131-0/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | completion: complete format.coverLetterrr/completion-format-coverletterRamkumar Ramachandra2014-01-071-0/+1
* | | | completion: fix remote.pushdefaultrr/completion-branch-configRamkumar Ramachandra2014-01-061-0/+1
* | | | completion: fix branch.autosetup(merge|rebase)Ramkumar Ramachandra2014-01-061-0/+1
* | | | completion: introduce __gitcomp_nl_append ()Ramkumar Ramachandra2014-01-062-4/+26
* | | | zsh completion: find matching custom bash completionRamkumar Ramachandra2014-01-061-1/+1
|/ / /
* | | 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