summaryrefslogtreecommitdiff
path: root/contrib
AgeCommit message (Expand)AuthorFilesLines
2011-03-19Merge branch 'ss/mergetool--lib'Libravatar Junio C Hamano1-1/+1
2011-03-13Merge branch 'pw/p4'Libravatar Junio C Hamano1-1/+1
2011-03-13git-p4: fix clone @all regressionLibravatar Pete Wyckoff1-1/+1
2011-03-09Merge branch 'js/cherry-pick-usability'Libravatar Junio C Hamano1-0/+2
2011-03-04Merge branch 'mh/p4'Libravatar Junio C Hamano1-1/+1
2011-02-28Merge branch 'svn-fe' of git://repo.or.cz/git/jrnLibravatar Junio C Hamano1-1/+2
2011-02-28mergetool--lib: Add Beyond Compare 3 as a toolLibravatar Sebastian Schuberth1-1/+1
2011-02-27Merge branch 'va/p4'Libravatar Junio C Hamano1-4/+31
2011-02-27Merge branch 'pw/p4'Libravatar Junio C Hamano1-11/+49
2011-02-26Merge commit 'jn/svn-fe' of git://github.com/gitster/git into svn-feLibravatar Jonathan Nieder1-1/+2
2011-02-25git-p4 submit: prevent 'Jobs' section from being removed from p4 change logLibravatar Michael Horowitz1-1/+1
2011-02-21bash: teach __git_ps1 about CHERRY_PICK_HEADLibravatar Jay Soffian1-0/+2
2011-02-21git-p4: Add copy detection supportLibravatar Vitor Antunes1-0/+16
2011-02-21git-p4: Improve rename detection supportLibravatar Vitor Antunes1-4/+15
2011-02-21git-p4: support clone --bareLibravatar Pete Wyckoff1-4/+13
2011-02-21git-p4: decode p4 wildcard charactersLibravatar Pete Wyckoff1-0/+18
2011-02-21git-p4: better message for "git-p4 sync" when not clonedLibravatar Pete Wyckoff1-0/+2
2011-02-21git-p4: reinterpret confusing p4 messageLibravatar Pete Wyckoff1-0/+4
2011-02-21git-p4: accommodate new move/delete type in p4Libravatar Pete Wyckoff1-5/+7
2011-02-21git-p4: add missing newline in initial import messageLibravatar Pete Wyckoff1-1/+1
2011-02-21git-p4: fix key error for p4 problemLibravatar Pete Wyckoff1-1/+4
2011-02-14Obey p4 views when using client specLibravatar Ian Wienand2-4/+51
2011-02-11Merge branch 'maint'Libravatar Junio C Hamano1-0/+3
2011-02-11svn-fe: warn about experimental statusLibravatar Jonathan Nieder1-0/+3
2011-02-09Merge branch 'jn/cherry-pick-strategy-option'Libravatar Junio C Hamano1-1/+12
2011-02-07post-receive-email: suppress error if description file missingLibravatar Sitaram Chamarty1-1/+1
2010-12-28cherry-pick/revert: add support for -X/--strategy-optionLibravatar Jonathan Nieder1-1/+12
2010-12-22Merge branch 'pd/bash-4-completion'Libravatar Junio C Hamano1-78/+290
2010-12-21Merge branch 'tc/completion-reflog'Libravatar Junio C Hamano1-1/+12
2010-12-20completion: add missing configuration variablesLibravatar Martin von Zweigbergk1-4/+66
2010-12-17bash completion: add basic support for git-reflogLibravatar Tay Ray Chuan1-1/+12
2010-12-15Merge branch 'master' (early part) into pd/bash-4-completionLibravatar Jonathan Nieder12-61/+288
2010-12-14bash: simple reimplementation of _get_comp_words_by_refLibravatar Jonathan Nieder1-8/+110
2010-12-14bash: get --pretty=m<tab> completion to work with bash v4Libravatar Peter van der Does1-76/+160
2010-12-09Merge branch 'maint'Libravatar Junio C Hamano1-4/+4
2010-12-09Merge branch 'ab/require-perl-5.8' into maintLibravatar Junio C Hamano2-2/+3
2010-12-09contrib/hooks/post-receive-email: fix return values from prep_for_emailLibravatar Alan Raison1-4/+4
2010-12-01Merge branch 'maint'Libravatar Junio C Hamano1-1/+1
2010-12-01Merge branch 'maint-1.7.2' into maintLibravatar Junio C Hamano1-1/+1
2010-12-01bash: Match lightweight tags in promptLibravatar knittl1-1/+1
2010-11-24Merge branch 'mm/phrase-remote-tracking'Libravatar Junio C Hamano1-1/+1
2010-11-24vcs-svn: Check for errors from open()Libravatar Jonathan Nieder1-1/+2
2010-11-24Merge branch 'dk/maint-blame-el' into maintLibravatar Junio C Hamano1-0/+1
2010-11-24Merge branch 'aw/git-p4-deletion' into maintLibravatar Junio C Hamano1-1/+3
2010-11-24Merge branch 'kf/post-receive-sample-hook' into maintLibravatar Junio C Hamano1-16/+31
2010-11-17Merge branch 'kb/completion-checkout'Libravatar Junio C Hamano1-3/+27
2010-11-17Merge branch 'sg/completion'Libravatar Junio C Hamano1-15/+64
2010-11-17Merge branch 'dk/maint-blame-el'Libravatar Junio C Hamano1-0/+1
2010-11-05Merge branch 'aw/git-p4-deletion'Libravatar Junio C Hamano1-1/+3
2010-11-03git-blame.el: Add (require 'format-spec)Libravatar David Kågedal1-0/+1