summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'lt/maint-wrap-zlib' into maintJunio C Hamano2009-02-059-34/+99
|\
| * Wrap inflate and other zlib routines for better error reportingLinus Torvalds2009-01-119-34/+99
* | Merge branch 'jc/maint-split-diff-metainfo' into maintJunio C Hamano2009-02-053-67/+99
|\ \
| * \ Merge branch 'jc/maint-1.6.0-split-diff-metainfo' into jc/maint-split-diff-me...Junio C Hamano2009-01-273-67/+99
| |\ \
| | * | diff.c: output correct index lines for a split diffJunio C Hamano2009-01-272-66/+98
* | | | Merge branch 'js/maint-all-implies-HEAD' into maintJunio C Hamano2009-02-056-2/+63
|\ \ \ \
| * | | | bundle: allow the same ref to be given more than onceJunio C Hamano2009-01-174-1/+23
| * | | | revision walker: include a detached HEAD in --allJohannes Schindelin2009-01-173-2/+41
* | | | | Merge branch 'kc/maint-diff-bwi-fix' into maintJunio C Hamano2009-02-052-2/+31
|\ \ \ \ \
| * | | | | Fix combined use of whitespace ignore options to diffKeith Cascio2009-01-192-6/+8
| * | | | | test more combinations of ignore-whitespace options to diffKeith Cascio2009-01-191-0/+27
* | | | | | urls.txt: document optional port specification in git URLSStefan Naewe2009-02-041-4/+4
* | | | | | Merge branch 'maint-1.6.0' into maintJunio C Hamano2009-02-042-5/+13
|\ \ \ \ \ \
| * | | | | | builtin-mv.c: check for unversionned files before looking at the destination.Matthieu Moy2009-02-042-5/+5
| * | | | | | Add a testcase for "git mv -f" on untracked files.Matthieu Moy2009-02-041-0/+8
| * | | | | | Missing && in t/t7001.sh.Matthieu Moy2009-02-041-1/+1
* | | | | | | Merge branch 'maint-1.6.0' into maintJunio C Hamano2009-02-035-4/+4
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | User-manual: "git stash <comment>" form is long goneWilliam Pursell2009-02-031-1/+1
| * | | | | | add test-dump-cache-tree in MakefileGuanqun Lu2009-02-032-1/+1
| * | | | | | fix typo in DocumentationGuanqun Lu2009-02-031-1/+1
| * | | | | | apply: fix access to an uninitialized mode variable, found by valgrindJohannes Schindelin2009-02-031-1/+1
* | | | | | | Merge branch 'maint-1.6.0' into maintJunio C Hamano2009-02-031-0/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | grep: pass -I (ignore binary) down to external grepJunio C Hamano2009-02-021-0/+2
* | | | | | | Merge branch 'maint-1.6.0' into maintJunio C Hamano2009-01-311-3/+6
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | merge: fix out-of-bounds memory accessRené Scharfe2009-01-311-3/+6
* | | | | | | GIT 1.6.1.2v1.6.1.2Junio C Hamano2009-01-293-2/+41
* | | | | | | Merge branch 'jc/maint-format-patch-o-relative' into maintJunio C Hamano2009-01-282-4/+76
|\ \ \ \ \ \ \
| * | | | | | | Teach format-patch to handle output directory relative to cwdJunio C Hamano2009-01-122-4/+76
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'bs/maint-rename-populate-filespec' into maintJunio C Hamano2009-01-281-2/+7
|\ \ \ \ \ \ \
| * | | | | | | Rename detection: Avoid repeated filespec populationBjörn Steinbrink2009-01-211-2/+7
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'mh/maint-commit-color-status' into maintJunio C Hamano2009-01-281-0/+6
|\ \ \ \ \ \ \
| * | | | | | | git-status -v: color diff output when color.ui is setMarkus Heidelberg2009-01-081-0/+3
| * | | | | | | git-commit: color status output when color.ui is setMarkus Heidelberg2009-01-081-0/+3
* | | | | | | | Merge branch 'nd/grep-assume-unchanged' into maintJunio C Hamano2009-01-282-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 'jc/maint-ls-tree' into maintJunio C Hamano2009-01-282-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 'np/no-loosen-prune-expire-now' into maintJunio C Hamano2009-01-282-3/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | objects to be pruned immediately don't have to be loosenedNicolas Pitre2009-01-012-3/+9
* | | | | | | | | | Merge branch 'mc/cd-p-pwd' into maintJunio C Hamano2009-01-282-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 'maint-1.6.0' into maintJunio C Hamano2009-01-281-1/+2
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |
| * | | | | | | | | avoid 31-bit truncation in write_loose_objectJeff King2009-01-281-1/+2
* | | | | | | | | | send-pack: do not send unknown object name from ".have" to pack-objectsJunio C Hamano2009-01-272-22/+127
* | | | | | | | | | Merge branch 'maint-1.6.0' into maintJunio C Hamano2009-01-272-2/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | / / | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | test-path-utils: Fix off by one, found by valgrindJohannes Schindelin2009-01-271-1/+1
| * | | | | | | | get_sha1_basic(): fix invalid memory access, found by valgrindJohannes Schindelin2009-01-271-1/+1
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | GIT 1.6.1.1v1.6.1.1Junio C Hamano2009-01-252-8/+18
View Lorry Controller Status