summaryrefslogtreecommitdiff
path: root/contrib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'pb/send-email-cccmd-fix'Junio C Hamano2009-06-201-1/+1
|\
| * Test cccmd in t9001-send-email.sh and fix some bugsPaolo Bonzini2009-06-181-1/+1
* | Merge branch 'maint'Junio C Hamano2009-06-181-5/+12
|\ \ | |/ |/|
| * import-tars: support symlinksJohannes Schindelin2009-06-181-5/+12
* | Merge branch 'da/araxis-mergetool'Junio C Hamano2009-06-131-1/+1
|\ \
| * | mergetool--lib: add support for araxis mergeDavid Aguilar2009-05-241-1/+1
* | | bash: add support for 'git stash pop --index' optionSZEDER Gábor2009-06-091-2/+2
* | | Show presence of stashed changes in bash prompt.Daniel Trstenjak2009-06-031-2/+10
* | | bash: remove always true if statement from __git_ps1()SZEDER Gábor2009-05-311-6/+4
* | | completion: fix PS1 display during an AM on detached HEADJunio C Hamano2009-05-271-13/+11
* | | post-receive-email: hooks.showrev: show how to include both web link and patchJim Meyering2009-05-231-0/+4
* | | Merge branch 'maint'Junio C Hamano2009-05-201-1/+1
|\ \ \ | | |/ | |/|
| * | completion: use git rev-parse to detect bare reposGiuseppe Bilotta2009-05-201-1/+1
* | | Merge branch 'mh/show-branch-color'Junio C Hamano2009-05-181-1/+4
|\ \ \
| * | | bash completion: show-branch color supportMarkus Heidelberg2009-04-251-1/+4
* | | | Merge branch 'maint'Junio C Hamano2009-05-161-2/+2
|\ \ \ \ | | |/ / | |/| |
| * | | completion: add missing options to show-branch and showStephen Boyd2009-05-161-2/+2
* | | | Merge branch 'maint'Junio C Hamano2009-05-161-10/+22
|\ \ \ \ | |/ / /
| * | | completion: enhance "current branch" displayJunio C Hamano2009-05-161-2/+13
| * | | completion: simplify "current branch" in __git_ps1()Junio C Hamano2009-05-161-7/+8
| * | | completion: fix PS1 display during a merge on detached HEADJunio C Hamano2009-05-161-3/+3
| | |/ | |/|
* | | bash completion: complete variable names for "git config" with optionsStephen Boyd2009-05-131-0/+33
|/ /
* | completion: complete values for send-emailStephen Boyd2009-05-051-3/+36
* | completion: complete values for log.dateStephen Boyd2009-05-051-3/+6
* | completion: complete values for help.formatStephen Boyd2009-05-051-0/+4
* | completion: add {gui,diff,merge}tool, man, and pager config variablesStephen Boyd2009-05-051-0/+45
* | completion: add missing configuration variables to _git_config()Stephen Boyd2009-05-051-0/+48
* | Fix a bunch of pointer declarations (codestyle)Felipe Contreras2009-05-011-3/+3
|/
* Documentation: fix typos / spelling mistakesMike Ralphson2009-04-201-2/+2
* Merge branch 'da/difftool'Junio C Hamano2009-04-174-431/+22
|\
| * bash completion: add git-difftoolDavid Aguilar2009-04-071-5/+22
| * difftool: move 'git-difftool' out of contribDavid Aguilar2009-04-073-394/+0
| * difftool/mergetool: add diffuse as merge and diff toolSebastian Pipping2009-04-073-7/+10
| * difftool: add a -y shortcut for --no-promptDavid Aguilar2009-04-072-25/+17
| * difftool: use perl built-ins when testing for msysDavid Aguilar2009-04-071-2/+5
| * difftool: remove the backup file featureDavid Aguilar2009-04-071-33/+1
| * difftool: remove merge options for opendiff, tkdiff, kdiff3 and xxdiffDavid Aguilar2009-04-071-7/+3
| * git-mergetool/difftool: make (g)vimdiff workable under WindowsMarkus Heidelberg2009-04-071-2/+8
* | Merge branch 'mh/html-path'Junio C Hamano2009-04-071-0/+1
|\ \ | |/ |/|
| * add --html-path to get the location of installed HTML docsMarkus Heidelberg2009-04-041-0/+1
* | bash completion: Update 'git am' optionsTodd Zullinger2009-04-051-1/+2
|/
* Merge branch 'maint'Junio C Hamano2009-03-301-2/+2
|\
| * Merge branch 'maint-1.6.1' into maintJunio C Hamano2009-03-301-2/+2
| |\
| | * Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-03-301-2/+7
| | |\
| | | * Fix bash completion in path with spacesDaniel Cheng (aka SDiZ)2009-03-301-2/+2
| | | * bash completion: only show 'log --merge' if mergingThomas Rast2009-03-301-1/+6
* | | | Merge branch 'maint'Junio C Hamano2009-03-291-1/+2
|\ \ \ \ | |/ / /
| * | | Merge branch 'maint-1.6.1' into maintJunio C Hamano2009-03-291-1/+2
| |\ \ \ | | |/ /
| | * | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-03-291-1/+2
| | |\ \ | | | |/
| | | * import-zips: fix thinkoJohannes Schindelin2009-03-291-1/+2