summaryrefslogtreecommitdiff
path: root/contrib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'maint'Junio C Hamano2010-12-091-4/+4
|\
| * Merge branch 'ab/require-perl-5.8' into maintJunio C Hamano2010-12-092-2/+3
| |\
| * | contrib/hooks/post-receive-email: fix return values from prep_for_emailAlan Raison2010-12-091-4/+4
* | | Merge branch 'maint'Junio C Hamano2010-12-011-1/+1
|\ \ \ | |/ /
| * | Merge branch 'maint-1.7.2' into maintJunio C Hamano2010-12-011-1/+1
| |\ \
| | * | bash: Match lightweight tags in promptknittl2010-12-011-1/+1
| * | | Merge branch 'dk/maint-blame-el' into maintJunio C Hamano2010-11-241-0/+1
| |\ \ \
| * \ \ \ Merge branch 'aw/git-p4-deletion' into maintJunio C Hamano2010-11-241-1/+3
| |\ \ \ \
| * \ \ \ \ Merge branch 'kf/post-receive-sample-hook' into maintJunio C Hamano2010-11-241-16/+31
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'mm/phrase-remote-tracking'Junio C Hamano2010-11-241-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Change incorrect "remote branch" to "remote tracking branch" in C codeMatthieu Moy2010-11-031-1/+1
* | | | | | | | Merge branch 'kb/completion-checkout'Junio C Hamano2010-11-171-3/+27
|\ \ \ \ \ \ \ \
| * | | | | | | | completion: Support the DWIM mode for git checkoutKevin Ballard2010-10-131-3/+27
* | | | | | | | | Merge branch 'sg/completion'Junio C Hamano2010-11-171-15/+64
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | bash: support pretty format aliasesSZEDER Gábor2010-10-131-4/+17
| * | | | | | | | | bash: support more 'git notes' subcommands and their optionsSZEDER Gábor2010-10-131-9/+41
| * | | | | | | | | bash: not all 'git bisect' subcommands make sense when not bisectingSZEDER Gábor2010-10-131-1/+5
| * | | | | | | | | bash: offer refs for 'git bisect start'SZEDER Gábor2010-10-131-1/+1
| |/ / / / / / / /
* | | | | | | | | Merge branch 'dk/maint-blame-el'Junio C Hamano2010-11-171-0/+1
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | git-blame.el: Add (require 'format-spec)David Kågedal2010-11-031-0/+1
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'aw/git-p4-deletion'Junio C Hamano2010-11-051-1/+3
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Fix handling of git-p4 on deleted filesAndrew Waters2010-10-221-1/+3
* | | | | | | | contrib/ciabot: git-describe commit instead of HEADSven Eckelmann2010-10-291-1/+1
* | | | | | | | completion: fix zsh check under bash with 'set -u'Mark Lodato2010-10-281-3/+3
| |_|_|/ / / / |/| | | | | |
* | | | | | | Merge branch 'ab/require-perl-5.8'Junio C Hamano2010-10-262-2/+3
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | perl: use "use warnings" instead of -wÆvar Arnfjörð Bjarmason2010-09-272-2/+3
* | | | | | | Merge branch 'kf/post-receive-sample-hook'Junio C Hamano2010-10-261-16/+31
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | post-receive-email: ensure sent messages are not emptyKevin P. Fleming2010-09-101-16/+31
* | | | | | | Merge branch 'ml/completion-zsh'Junio C Hamano2010-10-261-4/+46
|\ \ \ \ \ \ \
| * | | | | | | completion: make compatible with zshMark Lodato2010-09-091-4/+46
| | |/ / / / / | |/| | | | |
* | | | | | | {cvs,svn}import: use the new 'git read-tree --empty'Thomas Rast2010-10-191-1/+1
| |_|_|_|/ / |/| | | | |
* | | | | | Merge branch 'gb/shell-ext'Junio C Hamano2010-09-293-0/+46
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Add sample commands for git-shellGreg Brockman2010-08-123-0/+46
* | | | | | contrib/completion: --no-index option to git diffMichael J Gruber2010-09-271-1/+1
* | | | | | prefer test -h over test -L in shell scriptsJeff King2010-09-271-1/+1
| |/ / / / |/| | | |
* | | | | Merge branch 'jn/update-contrib-example-merge'Junio C Hamano2010-09-031-25/+90
|\ \ \ \ \
| * | | | | merge script: learn --[no-]rerere-autoupdateJonathan Nieder2010-08-181-2/+5
| * | | | | merge script: notice @{-1} shorthandJonathan Nieder2010-08-181-2/+4
| * | | | | merge script: handle --no-ff --no-commit correctlyJonathan Nieder2010-08-181-2/+10
| * | | | | merge script: --ff-only to disallow true mergeJonathan Nieder2010-08-181-2/+15
| * | | | | merge script: handle many-way octopusJonathan Nieder2010-08-181-3/+3
| * | | | | merge script: handle -m --log correctlyJonathan Nieder2010-08-181-4/+10
| * | | | | merge script: forbid merge -s indexJonathan Nieder2010-08-181-0/+5
| * | | | | merge script: allow custom strategiesJonathan Nieder2010-08-181-2/+6
| * | | | | merge script: merge -X<option>Jonathan Nieder2010-08-181-1/+7
| * | | | | merge script: improve log message subjectJonathan Nieder2010-08-181-8/+19
| * | | | | merge script: refuse to merge during mergeJonathan Nieder2010-08-181-0/+3
| * | | | | merge script: tweak unmerged files message to match builtinJonathan Nieder2010-08-181-1/+1
| * | | | | merge script: --squash, --ff from unborn branch are errorsJonathan Nieder2010-08-181-0/+4
| |/ / / /
* | | | | Merge branch 'jn/cherry-revert-message-clean-up'Junio C Hamano2010-08-311-1/+0
|\ \ \ \ \