summaryrefslogtreecommitdiff
path: root/contrib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sg/completion-cleanup'Junio C Hamano2011-05-061-161/+60
|\
| * completion: remove unnecessary _get_comp_words_by_ref() invocationsSZEDER Gábor2011-04-281-105/+11
| * completion: don't modify the $cur variable in completion functionsSZEDER Gábor2011-04-281-57/+50
* | Merge branch 'jk/notes-ui-updates'Junio C Hamano2011-05-021-1/+1
|\ \ | |/ |/|
| * contrib/completion: --notes, --no-notesMichael J Gruber2011-04-141-1/+1
* | Automatically autoload bashcompinit for ZSH, when neededMarius Storm-Olsen2011-04-271-8/+8
* | git-p4: replace each tab with 8 spaces for consistencyAndrew Garber2011-04-071-32/+32
* | git.el: Don't use font-lock-compile-keywordsLawrence Mitchell2011-04-031-3/+10
* | Merge branch 'maint'Junio C Hamano2011-03-301-2/+2
|\ \ | |/ |/|
| * contrib/thunderbird-patch-inline: do not require bash to run the scriptMaxin john2011-03-301-2/+2
* | Merge branch 'mg/rev-list-n-parents'Junio C Hamano2011-03-261-0/+2
|\ \
| * | rev-list --min-parents,--max-parents: doc, test and completionMichael J Gruber2011-03-231-0/+2
* | | Merge branch 'jp/completion-help-alias'Junio C Hamano2011-03-261-1/+1
|\ \ \
| * | | git-completion: Add git help completion for aliasesJakob Pfender2011-03-221-1/+1
* | | | Merge branch 'pw/p4'Junio C Hamano2011-03-231-1/+3
|\ \ \ \
| * | | | git-p4: fix sync new branch regressionPete Wyckoff2011-03-161-1/+3
* | | | | Merge branch 'tl/p4'Junio C Hamano2011-03-221-10/+27
|\ \ \ \ \
| * | | | | git-p4: Fix error message crash in P4Sync.commit.Tor Arvid Lund2011-03-151-1/+1
| * | | | | Teach git-p4 to ignore case in perforce filenames if configured.Tor Arvid Lund2011-03-151-7/+20
| * | | | | git-p4: Teach gitConfig method about arguments.Tor Arvid Lund2011-03-151-2/+6
* | | | | | Merge branch 'sg/complete-symmetric-diff'Junio C Hamano2011-03-221-14/+17
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | bash: complete 'git diff ...branc<TAB>'SZEDER Gábor2011-03-101-13/+16
| * | | | | bash: fix misindented esac statement in __git_complete_file()SZEDER Gábor2011-03-101-1/+1
* | | | | | 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
| |/ /