aboutsummaryrefslogtreecommitdiff
path: root/contrib
Commit message (Expand)AuthorAge
* Merge branch 'mk/grep-pcre'Junio C Hamano2011-05-30
|\
| * git-grep: Learn PCREMichał Kiedrowicz2011-05-09
| * contrib/completion: --line-number to git grepMichał Kiedrowicz2011-05-05
* | Merge branch 'ld/p4-preserve-user-names'Junio C Hamano2011-05-19
|\ \
| * | git-p4: warn if git authorship won't be retainedLuke Diamand2011-05-13
| * | git-p4: small improvements to user-preservationLuke Diamand2011-05-09
| * | git-p4: add option to preserve user namesLuke Diamand2011-04-26
| |/
* | Merge branch 'sg/completion-updates'Junio C Hamano2011-05-16
|\ \
| * \ Merge branch 'fc/completion-zsh' into sg/completion-updatesJunio C Hamano2011-05-10
| |\ \
| | * | git-completion: fix regression in zsh supportFelipe Contreras2011-05-10
| | |/
| * | Revert "completion: don't declare 'local words' to make zsh happy"Junio C Hamano2011-05-10
| * | completion: move private shopt shim for zsh to __git_ namespaceJonathan Nieder2011-05-08
| * | completion: don't declare 'local words' to make zsh happySZEDER Gábor2011-04-28
* | | Merge branch 'sg/completion-cleanup'Junio C Hamano2011-05-06
|\ \ \ | |/ /
| * | completion: remove unnecessary _get_comp_words_by_ref() invocationsSZEDER Gábor2011-04-28
| * | completion: don't modify the $cur variable in completion functionsSZEDER Gábor2011-04-28
* | | Merge branch 'jk/notes-ui-updates'Junio C Hamano2011-05-02
|\ \ \ | |/ / |/| |
| * | contrib/completion: --notes, --no-notesMichael J Gruber2011-04-14
* | | Automatically autoload bashcompinit for ZSH, when neededMarius Storm-Olsen2011-04-27
| |/ |/|
* | git-p4: replace each tab with 8 spaces for consistencyAndrew Garber2011-04-07
* | git.el: Don't use font-lock-compile-keywordsLawrence Mitchell2011-04-03
* | Merge branch 'maint'Junio C Hamano2011-03-30
|\ \ | |/ |/|
| * contrib/thunderbird-patch-inline: do not require bash to run the scriptMaxin john2011-03-30
* | Merge branch 'mg/rev-list-n-parents'Junio C Hamano2011-03-26
|\ \
| * | rev-list --min-parents,--max-parents: doc, test and completionMichael J Gruber2011-03-23
* | | Merge branch 'jp/completion-help-alias'Junio C Hamano2011-03-26
|\ \ \
| * | | git-completion: Add git help completion for aliasesJakob Pfender2011-03-22
* | | | Merge branch 'pw/p4'Junio C Hamano2011-03-23
|\ \ \ \
| * | | | git-p4: fix sync new branch regressionPete Wyckoff2011-03-16
* | | | | Merge branch 'tl/p4'Junio C Hamano2011-03-22
|\ \ \ \ \
| * | | | | git-p4: Fix error message crash in P4Sync.commit.Tor Arvid Lund2011-03-15
| * | | | | Teach git-p4 to ignore case in perforce filenames if configured.Tor Arvid Lund2011-03-15
| * | | | | git-p4: Teach gitConfig method about arguments.Tor Arvid Lund2011-03-15
* | | | | | Merge branch 'sg/complete-symmetric-diff'Junio C Hamano2011-03-22
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | bash: complete 'git diff ...branc<TAB>'SZEDER Gábor2011-03-10
| * | | | | bash: fix misindented esac statement in __git_complete_file()SZEDER Gábor2011-03-10
* | | | | | Merge branch 'ss/mergetool--lib'Junio C Hamano2011-03-19
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | mergetool--lib: Add Beyond Compare 3 as a toolSebastian Schuberth2011-02-28
| |/ / / /
* | | | | Merge branch 'pw/p4'Junio C Hamano2011-03-13
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | git-p4: fix clone @all regressionPete Wyckoff2011-03-13
* | | | | Merge branch 'js/cherry-pick-usability'Junio C Hamano2011-03-09
|\ \ \ \ \
| * | | | | bash: teach __git_ps1 about CHERRY_PICK_HEADJay Soffian2011-02-21
| | |_|/ / | |/| | |
* | | | | Merge branch 'mh/p4'Junio C Hamano2011-03-04
|\ \ \ \ \
| * | | | | git-p4 submit: prevent 'Jobs' section from being removed from p4 change logMichael Horowitz2011-02-25
| | |_|/ / | |/| | |
* | | | | Merge branch 'svn-fe' of git://repo.or.cz/git/jrnJunio C Hamano2011-02-28
|\ \ \ \ \
| * \ \ \ \ Merge commit 'jn/svn-fe' of git://github.com/gitster/git into svn-feJonathan Nieder2011-02-26
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | vcs-svn: Check for errors from open()Jonathan Nieder2010-11-24
* | | | | | Merge branch 'va/p4'Junio C Hamano2011-02-27
|\ \ \ \ \ \
| * | | | | | git-p4: Add copy detection supportVitor Antunes2011-02-21
| * | | | | | git-p4: Improve rename detection supportVitor Antunes2011-02-21
| | |_|/ / / | |/| | | |