summaryrefslogtreecommitdiff
path: root/contrib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ss/mergetool--lib'Junio C Hamano2011-03-191-1/+1
|\
| * mergetool--lib: Add Beyond Compare 3 as a toolSebastian Schuberth2011-02-281-1/+1
* | Merge branch 'pw/p4'Junio C Hamano2011-03-131-1/+1
|\ \
| * | git-p4: fix clone @all regressionPete Wyckoff2011-03-131-1/+1
* | | Merge branch 'js/cherry-pick-usability'Junio C Hamano2011-03-091-0/+2
|\ \ \
| * | | bash: teach __git_ps1 about CHERRY_PICK_HEADJay Soffian2011-02-211-0/+2
* | | | Merge branch 'mh/p4'Junio C Hamano2011-03-041-1/+1
|\ \ \ \
| * | | | git-p4 submit: prevent 'Jobs' section from being removed from p4 change logMichael Horowitz2011-02-251-1/+1
| | |_|/ | |/| |
* | | | Merge branch 'svn-fe' of git://repo.or.cz/git/jrnJunio C Hamano2011-02-281-1/+2
|\ \ \ \
| * \ \ \ Merge commit 'jn/svn-fe' of git://github.com/gitster/git into svn-feJonathan Nieder2011-02-261-1/+2
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | vcs-svn: Check for errors from open()Jonathan Nieder2010-11-241-1/+2
* | | | | Merge branch 'va/p4'Junio C Hamano2011-02-271-4/+31
|\ \ \ \ \
| * | | | | git-p4: Add copy detection supportVitor Antunes2011-02-211-0/+16
| * | | | | git-p4: Improve rename detection supportVitor Antunes2011-02-211-4/+15
| | |_|/ / | |/| | |
* | | | | Merge branch 'pw/p4'Junio C Hamano2011-02-271-11/+49
|\ \ \ \ \ | |_|/ / / |/| | | / | | |_|/ | |/| |
| * | | git-p4: support clone --barePete Wyckoff2011-02-211-4/+13
| * | | git-p4: decode p4 wildcard charactersPete Wyckoff2011-02-211-0/+18
| * | | git-p4: better message for "git-p4 sync" when not clonedPete Wyckoff2011-02-211-0/+2
| * | | git-p4: reinterpret confusing p4 messagePete Wyckoff2011-02-211-0/+4
| * | | git-p4: accommodate new move/delete type in p4Pete Wyckoff2011-02-211-5/+7
| * | | git-p4: add missing newline in initial import messagePete Wyckoff2011-02-211-1/+1
| * | | git-p4: fix key error for p4 problemPete Wyckoff2011-02-211-1/+4
| |/ /
* | | Obey p4 views when using client specIan Wienand2011-02-142-4/+51
* | | Merge branch 'maint'Junio C Hamano2011-02-111-0/+3
|\ \ \
| * | | svn-fe: warn about experimental statusJonathan Nieder2011-02-111-0/+3
* | | | Merge branch 'jn/cherry-pick-strategy-option'Junio C Hamano2011-02-091-1/+12
|\ \ \ \ | |/ / / |/| | |
| * | | cherry-pick/revert: add support for -X/--strategy-optionJonathan Nieder2010-12-281-1/+12
| |/ /
* | | post-receive-email: suppress error if description file missingSitaram Chamarty2011-02-071-1/+1
|/ /
* | Merge branch 'pd/bash-4-completion'Junio C Hamano2010-12-221-78/+290
|\ \
| * \ Merge branch 'master' (early part) into pd/bash-4-completionJonathan Nieder2010-12-1512-61/+288
| |\ \
| * | | bash: simple reimplementation of _get_comp_words_by_refJonathan Nieder2010-12-141-8/+110
| * | | bash: get --pretty=m<tab> completion to work with bash v4Peter van der Does2010-12-141-76/+160
* | | | Merge branch 'tc/completion-reflog'Junio C Hamano2010-12-211-1/+12
|\ \ \ \
| * | | | bash completion: add basic support for git-reflogTay Ray Chuan2010-12-171-1/+12
* | | | | completion: add missing configuration variablesMartin von Zweigbergk2010-12-201-4/+66
|/ / / /
* | | | 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