summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* fast-import: allow for multiple --import-marks= argumentsSverre Rabbelier2009-12-043-6/+45
* fast-import: test the new option commandSverre Rabbelier2009-12-041-1/+36
* fast-import: add option commandSverre Rabbelier2009-12-042-25/+94
* fast-import: add feature commandSverre Rabbelier2009-12-043-0/+133
* fast-import: put marks reading in its own functionSverre Rabbelier2009-12-041-42/+51
* fast-import: put option parsing code in separate functionsSverre Rabbelier2009-12-041-40/+75
* Merge branch 'maint'Junio C Hamano2009-12-033-2/+53
|\
| * Prepare for 1.6.5.5Junio C Hamano2009-12-031-0/+44
| * Merge branch 'uk/maint-shortlog-encoding' into maintJunio C Hamano2009-12-032-9/+39
| |\
| | * t4201: use ISO8859-1 rather than ISO-8859-1Brandon Casey2009-12-031-2/+2
| * | Merge branch 'fc/maint-format-patch-pathspec-dashes' into maintJunio C Hamano2009-12-032-1/+7
| |\ \
| * \ \ Merge branch 'ap/maint-merge-strategy-list-fix' into maintJunio C Hamano2009-12-031-1/+1
| |\ \ \
| * \ \ \ Merge branch 'jc/maint-am-keep' into maintJunio C Hamano2009-12-031-5/+6
| |\ \ \ \
| * \ \ \ \ Merge branch 'rs/work-around-grep-opt-insanity' into maintJunio C Hamano2009-12-039-25/+32
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'rj/maint-cygwin-count-objects' into maintJunio C Hamano2009-12-031-0/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'mm/maint-hint-failed-merge' into maintJunio C Hamano2009-12-035-3/+32
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'th/maint-remote-update-help-string' into maintJunio C Hamano2009-12-031-1/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'rj/maint-t9700' into maintJunio C Hamano2009-12-031-1/+1
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'ls/maint-mailinfo-no-inbody' into maintJunio C Hamano2009-12-0316-5/+122
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'mo/maint-crlf-doc' into maintJunio C Hamano2009-12-031-3/+4
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'th/remote-usage' into maintJunio C Hamano2009-12-032-21/+52
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'pb/maint-use-custom-perl' into maintJunio C Hamano2009-12-034-4/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mm/config-pathname-tilde-expand' into maintJunio C Hamano2009-12-035-37/+69
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bc/grep-i-F' into maintJunio C Hamano2009-12-034-6/+27
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/maint-break-rename-reduce-memory' into maintJunio C Hamano2009-12-032-3/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rj/maint-simplify-cygwin-makefile' into maintJunio C Hamano2009-12-031-4/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rg/doc-workflow' into maintJunio C Hamano2009-12-031-0/+115
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'np/maint-sideband-favor-status' into maintJunio C Hamano2009-12-032-23/+23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Documentation: xmlto 0.0.18 does not know --stringparamJunio C Hamano2009-12-031-0/+7
* | | | | | | | | | | | | | | | | | | | | gitweb: Describe (possible) gitweb.js minification in gitweb/READMEJakub Narebski2009-12-031-1/+2
* | | | | | | | | | | | | | | | | | | | | Fix crasher on encountering SHA1-like non-note in notes treeJohan Herland2009-12-032-0/+174
* | | | | | | | | | | | | | | | | | | | | t9001: use older Getopt::Long boolean prefix '--no' rather than '--no-'Brandon Casey2009-12-031-1/+1
* | | | | | | | | | | | | | | | | | | | | Merge in 1.6.5.4Junio C Hamano2009-12-032-3/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | Git 1.6.5.4v1.6.5.4Junio C Hamano2009-12-032-2/+3
| * | | | | | | | | | | | | | | | | | | | Unconditionally set man.base.url.for.relative.linksJunio C Hamano2009-12-031-2/+5
* | | | | | | | | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2009-12-031-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | Documentation/Makefile: allow man.base.url.for.relative.link to be set from MakeJunio C Hamano2009-12-031-0/+4
* | | | | | | | | | | | | | | | | | | | | Git 1.6.6-rc1v1.6.6-rc1Junio C Hamano2009-12-022-2/+2
* | | | | | | | | | | | | | | | | | | | | git-pull.sh: Fix call to git-merge for new command formatHorst H. von Brand2009-12-021-3/+3
* | | | | | | | | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2009-12-023-12/+43
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | Prepare for 1.6.5.4Junio C Hamano2009-12-022-1/+33
| * | | | | | | | | | | | | | | | | | | | merge: do not add standard message when message is given with -m optionJunio C Hamano2009-12-022-11/+10
| * | | | | | | | | | | | | | | | | | | | Do not misidentify "git merge foo HEAD" as an old-style invocationJunio C Hamano2009-12-021-1/+1
* | | | | | | | | | | | | | | | | | | | | Update draft release notes to 1.6.6 before -rc1Junio C Hamano2009-12-011-20/+67
* | | | | | | | | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2009-12-014-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | help: Do not unnecessarily look for a repositoryDavid Aguilar2009-12-011-3/+3
| * | | | | | | | | | | | | | | | | | | | Documentation: Fix a few i.e./e.g. mix-upsMichael J Gruber2009-12-012-2/+2
| * | | | | | | | | | | | | | | | | | | | Documentation: Document --branch option in git clone synopsisDavid Soria Parra2009-11-301-1/+1
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/deprecate-old-syntax-from-merge'Junio C Hamano2009-12-011-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | git-merge: a deprecation notice of the ancient command line syntaxJunio C Hamano2009-12-011-0/+6