summaryrefslogtreecommitdiff
path: root/contrib
Commit message (Expand)AuthorAgeFilesLines
* Sync with maintJunio C Hamano2012-05-241-2/+5
|\
| * osxkeychain: pull make config from top-level directoryJeff King2012-05-241-2/+5
* | Merge branch 'fc/git-complete-helper'Junio C Hamano2012-05-171-37/+33
|\ \
| * | completion: add new __git_complete helperFelipe Contreras2012-05-141-37/+33
* | | Merge branch 'fc/simplify-complete-revlist-file'Junio C Hamano2012-05-141-4/+2
|\ \ \ | |/ / |/| |
| * | completion: simplify __git_complete_revlist_fileFelipe Contreras2012-05-071-4/+2
* | | Merge branch 'pw/message-cleanup'Junio C Hamano2012-05-021-2/+2
|\ \ \
| * | | remove superfluous newlines in error messagesPete Wyckoff2012-04-301-2/+2
* | | | Merge branch 'jc/rerere-train'Junio C Hamano2012-05-021-1/+1
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | contrib/rerere-train: use installed git-sh-setupJunio C Hamano2012-04-301-1/+1
| |/
* | Merge branch 'fc/completion-tests'Junio C Hamano2012-04-241-9/+13
|\ \
| * | completion: fix completion after 'git --option <TAB>'SZEDER Gábor2012-04-211-1/+2
| * | completion: avoid trailing space for --exec-pathJonathan Nieder2012-04-211-0/+1
| * | completion: add missing general optionsFelipe Contreras2012-04-211-0/+2
| * | completion: simplify by using $prevFelipe Contreras2012-04-211-2/+2
| * | completion: simplify __gitcomp_1Felipe Contreras2012-04-211-6/+6
* | | Merge branch 'pw/git-p4'Junio C Hamano2012-04-233-2759/+12
|\ \ \ | |/ / |/| |
| * | git-p4: move to toplevelPete Wyckoff2012-04-093-2759/+12
| |/
* | Fix git-subtree install instructionsDavid A. Greene2012-04-091-12/+18
* | Use git-subtree test MakefileDavid A. Greene2012-04-091-1/+1
* | Add subtree test MakefileDavid A. Greene2012-04-091-0/+69
* | Install git-subtree from contribDavid A. Greene2012-04-091-20/+21
* | Use configure settings for git-subtreeDavid A. Greene2012-04-091-0/+3
* | Use project config filesDavid A. Greene2012-04-091-3/+6
* | Remove unnecessary git-subtree filesDavid A. Greene2012-04-096-143/+0
* | Set TEST_DIRECTORYDavid A. Greene2012-04-091-2/+4
* | Add 'contrib/subtree/' from commit 'd3a04e06c77d57978bb5230361c64946232cc346'David A. Greene2012-04-0915-0/+2196
|/
* correct spelling: an URL -> a URLJim Meyering2012-03-281-1/+1
* Merge branch 'am/completion-zsh-fix'Junio C Hamano2012-03-231-1/+2
|\
| * contrib/completion: "local var=()" is misinterpreted as func-decl by zsham/completion-zsh-fixAlex Merry2012-03-211-1/+2
* | Merge branch 'th/git-diffall'Junio C Hamano2012-03-151-28/+24
|\ \
| * | contrib/diffall: fix cleanup trap on Windowsth/git-diffallTim Henigan2012-03-141-4/+3
| * | contrib/diffall: eliminate duplicate while loopsTim Henigan2012-03-141-15/+9
| * | contrib/diffall: eliminate use of tarTim Henigan2012-03-141-4/+8
| * | contrib/diffall: create tmp dirs without mktempTim Henigan2012-03-141-7/+4
| * | contrib/diffall: comment actual reason for 'cdup'Tim Henigan2012-03-141-1/+3
* | | Merge branch 'zj/diff-stat-dyncol'Junio C Hamano2012-03-061-0/+1
|\ \ \ | |/ / |/| |
| * | diff --stat: add config option to limit graph widthzj/diff-stat-dyncolZbigniew Jędrzejewski-Szmek2012-03-011-0/+1
* | | Merge branch 'th/git-diffall'Junio C Hamano2012-03-012-0/+292
|\ \ \
| * | | contrib: add git-diffall scriptTim Henigan2012-02-272-0/+292
* | | | Merge branch 'pj/completion-remote-set-url-branches'Junio C Hamano2012-02-281-14/+18
|\ \ \ \
| * | | | completion: normalize increment/decrement stylepj/completion-remote-set-url-branchesPhilip Jägenstedt2012-02-221-12/+10
| * | | | completion: remote set-* <name> and <branch>Philip Jägenstedt2012-02-221-3/+9
* | | | | Merge branch 'maint'Junio C Hamano2012-02-271-4/+3
|\ \ \ \ \
| * | | | | post-receive-email: match up $LOGBEGIN..$LOGEND pairs correctlyMichael Haggerty2012-02-271-3/+3
| * | | | | post-receive-email: remove unused variableMichael Haggerty2012-02-271-1/+0
* | | | | | Merge branch 'maint'Junio C Hamano2012-02-261-33/+64
|\ \ \ \ \ \ | |/ / / / /
| * | | | | git-p4: fix submit regression with clientSpec and subdir clonePete Wyckoff2012-02-261-32/+54
| * | | | | git-p4: set useClientSpec variable on initial clonePete Wyckoff2012-02-261-1/+10
| |/ / / /
* | | | | Merge branch 'ld/git-p4-expanded-keywords'Junio C Hamano2012-02-231-10/+108
|\ \ \ \ \