summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* add -u: do not fail to resolve a path as deletedJunio C Hamano2009-01-282-1/+69
* 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
* | Merge branch 'cb/maint-unpack-trees-absense' into maintJunio C Hamano2009-01-232-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 'tr/maint-no-index-fixes' into maintJunio C Hamano2009-01-233-10/+20
|\ \ \
| * | | diff --no-index -q: fix endless loopThomas Rast2009-01-071-1/+3
| * | | diff --no-index: test for pager after option parsingThomas Rast2009-01-061-7/+7
| * | | diff: accept -- when using --no-indexThomas Rast2009-01-063-3/+11
* | | | Merge branch 'rs/maint-shortlog-foldline' into maintJunio C Hamano2009-01-232-5/+8
|\ \ \ \
| * | | | shortlog: handle multi-line subjects like log --pretty=oneline et. al. doRené Scharfe2009-01-062-5/+8
* | | | | Merge branch 'pj/maint-ldflags' into maintJunio C Hamano2009-01-231-2/+2
|\ \ \ \ \
| * | | | | configure clobbers LDFLAGSPaul Jarc2009-01-051-2/+2
* | | | | | Merge branch 'pb/maint-git-pm-false-dir' into maintJunio C Hamano2009-01-231-3/+4
|\ \ \ \ \ \
| * | | | | | Git.pm: correctly handle directory name that evaluates to "false"Philippe Bruhat (BooK)2009-01-011-3/+4
* | | | | | | Merge branch 'js/maint-bisect-gitk' into maintJunio C Hamano2009-01-231-1/+1
|\ \ \ \ \ \ \
| * | | | | | | bisect view: call gitk if Cygwin's SESSIONNAME variable is setJohannes Schindelin2009-01-031-1/+1
* | | | | | | | Merge branch 'js/add-not-submodule' into maintJunio C Hamano2009-01-232-0/+53
|\ \ \ \ \ \ \ \
| * | | | | | | | git add: do not add files from a submoduleJohannes Schindelin2009-01-052-0/+53
| |/ / / / / / /
* | | | | | | | Merge branch 'jc/maint-format-patch' into maintJunio C Hamano2009-01-231-0/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | format-patch: show patch text for the root commitJunio C Hamano2009-01-101-0/+7
* | | | | | | | | Merge branch 'am/maint-push-doc' into maintJunio C Hamano2009-01-231-7/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Documentation: avoid using undefined parametersAnders Melchiorsen2009-01-181-2/+2
| * | | | | | | | | Documentation: mention branches rather than headsAnders Melchiorsen2009-01-181-2/+2
| * | | | | | | | | Documentation: remove a redundant elaborationAnders Melchiorsen2009-01-181-2/+1
| * | | | | | | | | Documentation: git push repository can also be a remoteAnders Melchiorsen2009-01-181-1/+3
* | | | | | | | | | Merge branch 'maint-1.6.0' into maintJunio C Hamano2009-01-231-1/+1
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | Fix Documentation for git-describeBoyd Stephen Smith Jr2009-01-231-1/+1
* | | | | | | | | | Rename diff.suppress-blank-empty to diff.suppressBlankEmptyJohannes Schindelin2009-01-213-6/+8
* | | | | | | | | | shell: Document that 'cvs server' is a valid commandLars Noschinski2009-01-191-2/+3
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Update draft release notes for 1.6.1.1Junio C Hamano2009-01-171-1/+6
* | | | | | | | | Merge branch 'maint-1.6.0' into maintJunio C Hamano2009-01-174-4/+6
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | builtin-fsck: fix off by one head countChristian Couder2009-01-171-1/+1
| * | | | | | | | Documentation: let asciidoc align related optionsMarkus Heidelberg2009-01-171-1/+4
| * | | | | | | | githooks.txt: add missing wordStephan Beyer2009-01-171-1/+1
| * | | | | | | | builtin-commit.c: do not remove COMMIT_EDITMSGStephan Beyer2009-01-171-1/+0
* | | | | | | | | t5540: clarify that http-push does not handle packed-refs on the remoteJohannes Schindelin2009-01-171-3/+15
* | | | | | | | | http-push: when making directories, have a trailing slash in the path nameJohannes Schindelin2009-01-173-2/+11
* | | | | | | | | http-push: fix off-by-path_lenJohannes Schindelin2009-01-171-3/+7
* | | | | | | | | Merge branch 'maint-1.6.0' into maintJunio C Hamano2009-01-152-0/+34
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | t3404: Add test case for auto-amending only edited commits after "edit"Stephan Beyer2009-01-151-0/+17
| * | | | | | | | t3404: Add test case for aborted --continue after "edit"Stephan Beyer2009-01-151-0/+15
| * | | | | | | | t3501: check that commits are actually doneStephan Beyer2009-01-151-0/+2
* | | | | | | | | Update draft release notes to 1.6.1.1Junio C Hamano2009-01-141-2/+23
* | | | | | | | | Merge branch 'maint-1.6.0' into maintJunio C Hamano2009-01-142-0/+26
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /