summaryrefslogtreecommitdiff
path: root/contrib
Commit message (Expand)AuthorAgeFilesLines
* shell-prompt: clean up nested if-thenMartin Erik Werner2013-02-181-14/+13
* Merge branch 'mp/diff-algo-config'Junio C Hamano2013-02-171-1/+13
|\
| * diff: Introduce --diff-algorithm command line optionMichal Privoznik2013-01-161-0/+11
| * config: Introduce diff.algorithm variableMichal Privoznik2013-01-161-0/+1
| * git-completion.bash: Autocomplete --minimal and --histogram for git-diffMichal Privoznik2013-01-141-1/+1
* | Merge branch 'mw/bash-prompt-show-untracked-config'Junio C Hamano2013-02-171-3/+8
|\ \
| * | shell prompt: add bash.showUntrackedFiles optionMartin Erik Werner2013-02-131-3/+8
* | | Merge branch 'mm/config-local-completion'Junio C Hamano2013-02-141-2/+2
|\ \ \
| * | | completion: support 'git config --local'Matthieu Moy2013-02-121-2/+2
| |/ /
* | | Merge branch 'mm/remote-mediawiki-build'Junio C Hamano2013-02-143-40/+11
|\ \ \
| * | | git-remote-mediawiki: use toplevel's MakefileMatthieu Moy2013-02-083-40/+11
* | | | Merge branch 'dg/subtree-fixes'Junio C Hamano2013-02-144-66/+40
|\ \ \ \ | |_|/ / |/| | |
| * | | contrib/subtree: make the manual directory if neededJesper L. Nielsen2013-02-051-0/+1
| * | | contrib/subtree: honor DESTDIRAdam Tkac2013-02-051-2/+2
| * | | contrib/subtree: fix synopsisDavid A. Greene2013-02-052-1/+8
| * | | contrib/subtree: better error handling for 'subtree add'David A. Greene2013-02-051-3/+9
| * | | contrib/subtree: use %B for split subject/bodyTechlive Zheng2013-02-052-5/+20
| * | | contrib/subtree: remove test number commentsDavid A. Greene2013-02-051-55/+0
* | | | Merge branch 'mk/tcsh-complete-only-known-paths'Junio C Hamano2013-02-081-0/+12
|\ \ \ \
| * | | | completion: handle path completion and colon for tcsh scriptMarc Khouzam2013-02-031-0/+12
* | | | | Merge branch 'mp/complete-paths'Junio C Hamano2013-02-081-15/+240
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | |
| * | | git-completion.bash: add support for path completionManlio Perillo2013-01-111-15/+240
* | | | Merge branch 'jk/remote-helpers-in-python-3'Junio C Hamano2013-02-041-2/+2
|\ \ \ \
| * | | | svn-fe: allow svnrdump_sim.py to run with Python 3John Keeping2013-01-241-2/+2
| | |_|/ | |/| |
* | | | Merge branch 'jc/do-not-let-random-file-interfere-with-completion-tests'Junio C Hamano2013-02-011-1/+10
|\ \ \ \
| * | | | t9902: protect test from stray build artifactsJunio C Hamano2013-01-241-1/+10
* | | | | Merge branch 'bc/fix-array-syntax-for-3.0-in-completion-bash'Junio C Hamano2013-01-281-1/+1
|\ \ \ \ \
| * | | | | git-completion.bash: replace zsh notation that breaks bash 3.XBrandon Casey2013-01-181-1/+1
| |/ / / /
| * | | | Merge branch 'jk/complete-commit-c' into maintJunio C Hamano2013-01-141-0/+7
| |\ \ \ \
* | \ \ \ \ Merge branch 'ch/add-auto-submitted-in-sample-post-receive-email'Junio C Hamano2013-01-231-0/+1
|\ \ \ \ \ \
| * | | | | | Add Auto-Submitted header to post-receive-emailChris Hiestand2013-01-171-0/+1
* | | | | | | Merge branch 'as/check-ignore'Junio C Hamano2013-01-231-0/+1
|\ \ \ \ \ \ \
| * | | | | | | add git-check-ignore sub-commandAdam Spiers2013-01-061-0/+1
* | | | | | | | Merge branch 'mh/remote-hg-mode-bits-fix'Junio C Hamano2013-01-212-1/+69
|\ \ \ \ \ \ \ \
| * | | | | | | | remote-hg: fix handling of file perms when pushingMax Horn2013-01-152-1/+69
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'fc/remote-hg-fixup-url'Junio C Hamano2013-01-211-0/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | remote-hg: store converted URLFelipe Contreras2013-01-151-0/+11
| |/ / / / / / /
* | | | | | | | Merge branch 'ds/completion-silence-in-tree-path-probe'Junio C Hamano2013-01-181-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | git-completion.bash: silence "not a valid object" errorsDylan Smith2013-01-111-1/+1
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'jn/maint-trim-vim-contrib'Junio C Hamano2013-01-181-13/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | contrib/vim: simplify instructions for old vim supportJonathan Nieder2013-01-101-13/+3
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'mk/complete-tcsh'Junio C Hamano2013-01-181-12/+21
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Prevent space after directories in tcsh completionMarc Khouzam2013-01-071-12/+21
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'fc/remote-bzr'Junio C Hamano2013-01-092-0/+868
|\ \ \ \ \ \ \
| * | | | | | | remote-bzr: detect local repositoriesFelipe Contreras2013-01-021-20/+28
| * | | | | | | remote-bzr: add support for older versions of bzrFelipe Contreras2013-01-021-5/+9
| * | | | | | | remote-bzr: add support to push special modesFelipe Contreras2013-01-021-17/+43
| * | | | | | | remote-bzr: add support for fecthing special modesFelipe Contreras2013-01-022-11/+59
| * | | | | | | remote-bzr: add simple testsFelipe Contreras2013-01-021-0/+111
| * | | | | | | remote-bzr: update working tree upon pushingFelipe Contreras2012-12-131-0/+2