summaryrefslogtreecommitdiff
path: root/contrib
AgeCommit message (Expand)Author
2011-03-23Merge branch 'tl/p4'Junio C Hamano
2011-03-23Merge branch 'sg/complete-symmetric-diff'Junio C Hamano
2011-03-20Merge branch 'ss/mergetool--lib'Junio C Hamano
2011-03-15git-p4: Fix error message crash in P4Sync.commit.Tor Arvid Lund
2011-03-15Teach git-p4 to ignore case in perforce filenames if configured.Tor Arvid Lund
2011-03-15git-p4: Teach gitConfig method about arguments.Tor Arvid Lund
2011-03-13Merge branch 'pw/p4'Junio C Hamano
2011-03-13git-p4: fix clone @all regressionPete Wyckoff
2011-03-11bash: complete 'git diff ...branc<TAB>'SZEDER Gábor
2011-03-11bash: fix misindented esac statement in __git_complete_file()SZEDER Gábor
2011-03-09Merge branch 'js/cherry-pick-usability'Junio C Hamano
2011-03-04Merge branch 'mh/p4'Junio C Hamano
2011-03-01Merge branch 'svn-fe' of git://repo.or.cz/git/jrnJunio C Hamano
2011-02-28mergetool--lib: Add Beyond Compare 3 as a toolSebastian Schuberth
2011-02-28Merge branch 'va/p4'Junio C Hamano
2011-02-28Merge branch 'pw/p4'Junio C Hamano
2011-02-26Merge commit 'jn/svn-fe' of git://github.com/gitster/git into svn-feJonathan Nieder
2011-02-26git-p4 submit: prevent 'Jobs' section from being removed from p4 change logMichael Horowitz
2011-02-22bash: teach __git_ps1 about CHERRY_PICK_HEADJay Soffian
2011-02-21git-p4: Add copy detection supportVitor Antunes
2011-02-21git-p4: Improve rename detection supportVitor Antunes
2011-02-21git-p4: support clone --barePete Wyckoff
2011-02-21git-p4: decode p4 wildcard charactersPete Wyckoff
2011-02-21git-p4: better message for "git-p4 sync" when not clonedPete Wyckoff
2011-02-21git-p4: reinterpret confusing p4 messagePete Wyckoff
2011-02-21git-p4: accommodate new move/delete type in p4Pete Wyckoff
2011-02-21git-p4: add missing newline in initial import messagePete Wyckoff
2011-02-21git-p4: fix key error for p4 problemPete Wyckoff
2011-02-14Obey p4 views when using client specIan Wienand
2011-02-12Merge branch 'maint'Junio C Hamano
2011-02-11svn-fe: warn about experimental statusJonathan Nieder
2011-02-10Merge branch 'jn/cherry-pick-strategy-option'Junio C Hamano
2011-02-07post-receive-email: suppress error if description file missingSitaram Chamarty
2010-12-28cherry-pick/revert: add support for -X/--strategy-optionJonathan Nieder
2010-12-22Merge branch 'pd/bash-4-completion'Junio C Hamano
2010-12-21Merge branch 'tc/completion-reflog'Junio C Hamano
2010-12-21completion: add missing configuration variablesMartin von Zweigbergk
2010-12-17bash completion: add basic support for git-reflogTay Ray Chuan
2010-12-15Merge branch 'master' (early part) into pd/bash-4-completionJonathan Nieder
2010-12-15bash: simple reimplementation of _get_comp_words_by_refJonathan Nieder
2010-12-15bash: get --pretty=m<tab> completion to work with bash v4Peter van der Does
2010-12-09Merge branch 'maint'Junio C Hamano
2010-12-09Merge branch 'ab/require-perl-5.8' into maintJunio C Hamano
2010-12-09contrib/hooks/post-receive-email: fix return values from prep_for_emailAlan Raison
2010-12-02Merge branch 'maint'Junio C Hamano
2010-12-02Merge branch 'maint-1.7.2' into maintJunio C Hamano
2010-12-01bash: Match lightweight tags in promptknittl
2010-11-24Merge branch 'mm/phrase-remote-tracking'Junio C Hamano
2010-11-24vcs-svn: Check for errors from open()Jonathan Nieder
2010-11-24Merge branch 'dk/maint-blame-el' into maintJunio C Hamano