summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'maint'Junio C Hamano2009-01-132-5/+6
|\
| * Merge branch 'maint-1.6.0' into maintJunio C Hamano2009-01-132-5/+6
| |\
| | * fast-import: Cleanup mode setting.Felipe Contreras2009-01-131-3/+4
| | * Git.pm: call Error::Simple() properlyJay Soffian2009-01-131-2/+2
* | | Merge branch 'nd/grep-assume-unchanged'Junio C Hamano2009-01-132-2/+20
|\ \ \
| * | | grep: grep cache entries if they are "assume unchanged"Nguyễn Thái Ngọc Duy2008-12-272-1/+13
| * | | grep: support --no-ext-grep to test builtin grepNguyễn Thái Ngọc Duy2008-12-271-1/+7
* | | | Merge branch 'as/maint-shortlog-cleanup'Junio C Hamano2009-01-131-16/+3
|\ \ \ \
| * | | | builtin-shortlog.c: use string_list_append(), and don't strdup unnecessarilyAdeodato Simó2009-01-011-16/+3
| |/ / /
* | | | Merge branch 'jc/maint-ls-tree'Junio C Hamano2009-01-132-2/+13
|\ \ \ \
| * | | | Document git-ls-tree --full-treeNanako Shiraishi2009-01-012-2/+8
| * | | | ls-tree: add --full-tree optionJunio C Hamano2008-12-261-0/+5
| |/ / /
* | | | Merge branch 'js/bundle-tags'Junio C Hamano2009-01-132-0/+65
|\ \ \ \
| * | | | bundle: allow rev-list options to exclude annotated tagsJohannes Schindelin2009-01-052-0/+65
* | | | | Merge branch 'js/add-not-submodule'Junio C Hamano2009-01-132-0/+53
|\ \ \ \ \
| * | | | | git add: do not add files from a submoduleJohannes Schindelin2009-01-052-0/+53
| | |/ / / | |/| | |
* | | | | Merge branch 'pb/maint-git-pm-false-dir'Junio C Hamano2009-01-131-3/+4
|\ \ \ \ \
| * | | | | Git.pm: correctly handle directory name that evaluates to "false"Philippe Bruhat (BooK)2009-01-011-3/+4
* | | | | | Merge branch 'pj/maint-ldflags'Junio C Hamano2009-01-131-2/+2
|\ \ \ \ \ \
| * | | | | | configure clobbers LDFLAGSPaul Jarc2009-01-051-2/+2
* | | | | | | Merge branch 'fe/cvsserver'Junio C Hamano2009-01-132-4/+20
|\ \ \ \ \ \ \
| * | | | | | | cvsserver: change generation of CVS author namesFabian Emmes2009-01-051-3/+9
| * | | | | | | cvsserver: add option to configure commit messageFabian Emmes2009-01-032-1/+11
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'js/maint-bisect-gitk'Junio C Hamano2009-01-131-1/+1
|\ \ \ \ \ \ \
| * | | | | | | bisect view: call gitk if Cygwin's SESSIONNAME variable is setJohannes Schindelin2009-01-031-1/+1
| |/ / / / / /
* | | | | | | Merge branch 'np/no-loosen-prune-expire-now'Junio C Hamano2009-01-132-3/+9
|\ \ \ \ \ \ \
| * | | | | | | objects to be pruned immediately don't have to be loosenedNicolas Pitre2009-01-012-3/+9
* | | | | | | | Merge branch 'cb/maint-unpack-trees-absense'Junio C Hamano2009-01-132-18/+67
|\ \ \ \ \ \ \ \
| * | | | | | | | unpack-trees: remove redundant path search in verify_absentClemens Buchacher2009-01-051-6/+2
| * | | | | | | | unpack-trees: fix path search bug in verify_absentClemens Buchacher2009-01-052-10/+37
| * | | | | | | | unpack-trees: handle failure in verify_absentClemens Buchacher2009-01-052-3/+29
* | | | | | | | | Merge branch 'mc/cd-p-pwd'Junio C Hamano2009-01-132-3/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git-sh-setup: Fix scripts whose PWD is a symlink to a work-dir on OS XMarcel M. Cary2009-01-052-3/+3
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'mh/cherry-default'Junio C Hamano2009-01-132-3/+16
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Documentation: clarify which parameters are optional to git-cherryMarkus Heidelberg2009-01-052-2/+2
| * | | | | | | | | git-cherry: make <upstream> parameter optionalMarkus Heidelberg2009-01-012-3/+16
| |/ / / / / / / /
* | | | | | | | | Merge branch 'maint'Junio C Hamano2009-01-132-1/+4
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | Merge branch 'kk/maint-http-push' into maintJunio C Hamano2009-01-131-6/+19
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'js/maint-merge-recursive-r-d-conflict' into maintJunio C Hamano2009-01-132-0/+28
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'cb/maint-merge-recursive-fix' into maintJunio C Hamano2009-01-132-0/+119
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'ap/maint-apply-modefix' into maintJunio C Hamano2009-01-132-1/+65
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'maint-1.6.0' into maintJunio C Hamano2009-01-132-1/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |
| | * | | | | | | | | | | Avoid spurious error messages on error mistakes.Pierre Habouzit2009-01-131-1/+1
| | * | | | | | | | | | | contrib/examples/README: give an explanation of the status of these filesjidanni@jidanni.org2009-01-121-0/+3
* | | | | | | | | | | | | Fix Documentation typos surrounding the word 'handful'.Jon Loeliger2009-01-138-11/+11
* | | | | | | | | | | | | sha1_file: make "read_object" staticChristian Couder2009-01-132-5/+5
* | | | | | | | | | | | | contrib/vim: change URL to point to the latest syntax filesMarkus Heidelberg2009-01-121-5/+7
* | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2009-01-111-3/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge branch 'mh/maint-sendmail-cc-doc' into maintJunio C Hamano2009-01-111-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-do-not-switch-to-non-commit' into maintJunio C Hamano2009-01-112-1/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \