summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'maint-1.7.0' into maint-1.7.1Junio C Hamano2011-02-163-20/+26
|\
| * fast-import: introduce "feature notes" commandJonathan Nieder2011-02-093-0/+9
| * fast-import: clarify documentation of "feature" commandJonathan Nieder2011-02-091-20/+17
* | Merge branch 'maint-1.7.0' into maint-1.7.1Junio C Hamano2011-01-101-1/+1
|\ \ | |/
| * Documentation/git-archive: spell --worktree-attributes correctlyThomas Rast2011-01-101-1/+1
* | Documentation/githooks: post-rewrite-copy-notes never existedThomas Rast2011-01-101-4/+0
* | Git 1.7.1.4v1.7.1.4Junio C Hamano2010-12-158-19/+104
|\ \ | |/
| * Git 1.7.0.9v1.7.0.9Junio C Hamano2010-12-157-19/+96
| |\
| | * Git 1.6.6.3v1.6.6.3Junio C Hamano2010-12-156-19/+88
| | |\
| | | * Git 1.6.5.9v1.6.5.9Junio C Hamano2010-12-155-18/+64
| | | |\
| | | | * Git 1.6.4.5v1.6.4.5Junio C Hamano2010-12-153-2/+22
| | | | * gitweb: Introduce esc_attr to escape attributes of HTML elementsJakub Narebski2010-12-151-15/+22
* | | | | Git 1.7.1.3v1.7.1.3Junio C Hamano2010-12-024-2/+22
|\ \ \ \ \ | |/ / / /
| * | | | Git 1.7.0.8v1.7.0.8Junio C Hamano2010-12-023-2/+12
* | | | | Merge branch 'maint-1.7.0' into maint-1.7.1Junio C Hamano2010-12-012-2/+7
|\ \ \ \ \ | |/ / / /
| * | | | add: introduce add.ignoreerrors synonym for add.ignore-errorsJonathan Nieder2010-12-012-2/+7
* | | | | t0003: add missing && at end of linesMatthieu Moy2010-08-291-5/+5
* | | | | Git 1.7.1.2v1.7.1.2Junio C Hamano2010-07-273-2/+13
* | | | | Sync with 1.7.0 seriesJunio C Hamano2010-07-274-2/+44
|\ \ \ \ \ | |/ / / /
| * | | | Git 1.7.0.7v1.7.0.7Junio C Hamano2010-07-274-3/+20
| * | | | config --get --path: check for unset $HOMEJonathan Nieder2010-07-272-1/+25
* | | | | Merge branch 'maint-1.7.0' into maint-1.7.1Junio C Hamano2010-07-251-1/+4
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'maint-1.6.6' into maint-1.7.0Junio C Hamano2010-07-254-3/+26
| |\ \ \ \ | | |/ / /
| | * | | Merge branch 'maint-1.6.5' into maint-1.6.6Junio C Hamano2010-07-254-3/+26
| | |\ \ \ | | | |/ /
| | | * | request-pull.txt: Document -p optionStephen Boyd2010-07-251-1/+4
| | | * | Merge branch 'maint-1.6.4' into maint-1.6.5Junio C Hamano2010-07-253-2/+22
| | | |\ \ | | | | |/
| | | | * Check size of path buffer before writing into itGreg Brockman2010-07-251-0/+2
* | | | | t/README: clarify test_must_fail descriptionBrandon Casey2010-07-201-0/+8
* | | | | Check size of path buffer before writing into itGreg Brockman2010-07-201-0/+2
* | | | | update-server-info: Shorten read_pack_info_file()Ralf Thielow2010-07-191-3/+0
* | | | | Documentation: Explain git-mergetool's use of temporary filesDavid Aguilar2010-07-191-0/+10
* | | | | Documentation: add submodule.* to the big configuration variable listJonathan Nieder2010-07-151-0/+9
* | | | | gitmodules.5: url can be a relative pathJonathan Nieder2010-07-151-0/+3
* | | | | gitweb: fix esc_urlPavan Kumar Sunkara2010-07-151-2/+1
* | | | | git fetch documentation: describe short '-p' synonym to '--prune' optionOren Held2010-07-131-0/+1
* | | | | format-patch: document the format.to configuration settingMiklos Vajna2010-07-131-2/+4
* | | | | Documentation: Spelling fix in protocol-capabilities.txtFredrik Skolmli2010-07-091-1/+1
* | | | | checkout: accord documentation to what git doesNicolas Sebrecht2010-07-091-1/+1
* | | | | t0005: work around strange $? in ksh when program terminated by a signalJohannes Sixt2010-07-091-0/+1
* | | | | backmerge a few more fixes to 1.7.1.X seriesJunio C Hamano2010-07-072-1/+20
* | | | | Merge branch 'maint-1.6.4' into maintJunio C Hamano2010-07-072-2/+20
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-optionUwe Kleine-König2010-07-072-2/+20
* | | | | Merge branch 'mg/doc-rev-parse-treepath-syntax' into maintJunio C Hamano2010-07-071-6/+9
|\ \ \ \ \
| * | | | | git-rev-parse.txt: Add more examples for caret and colonMichael J Gruber2010-06-291-7/+8
| * | | | | git-rev-parse.txt: Document ":path" specifierMichael J Gruber2010-06-271-1/+3
* | | | | | Merge branch 'tr/receive-pack-aliased-update-fix' into maintJunio C Hamano2010-07-072-37/+140
|\ \ \ \ \ \
| * | | | | | check_aliased_update: strcpy() instead of strcat() to copyThomas Rast2010-06-111-2/+2
| * | | | | | receive-pack: detect aliased updates which can occur with symrefsJay Soffian2010-04-192-4/+113
| * | | | | | receive-pack: switch global variable 'commands' to a parameterJay Soffian2010-04-191-33/+27
* | | | | | | fix git branch -m in presence of cross devicesPierre Habouzit2010-07-071-6/+15