summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* t0000: drop "known breakage" testjk/test-framework-updatesJeff King2014-01-021-3/+0
* t0000: simplify HARNESS_ACTIVE hackJeff King2014-01-022-11/+5
* t0000: set TEST_OUTPUT_DIRECTORY for sub-testsJeff King2014-01-021-0/+2
* Git 1.8.5.2v1.8.5.2Junio C Hamano2013-12-174-3/+24
* Merge branch 'rs/doc-submitting-patches' into maintJunio C Hamano2013-12-171-2/+9
|\
| * SubmittingPatches: document how to handle multiple patchesrs/doc-submitting-patchesRené Scharfe2013-11-271-2/+9
* | Merge branch 'tr/doc-git-cherry' into maintJunio C Hamano2013-12-171-33/+110
|\ \
| * | Documentation: revamp git-cherry(1)tr/doc-git-cherryThomas Rast2013-11-271-33/+110
* | | Merge branch 'nd/glossary-content-pathspec-markup' into maintJunio C Hamano2013-12-171-3/+3
|\ \ \
| * | | glossary-content.txt: fix documentation of "**" patternsnd/glossary-content-pathspec-markupNguyễn Thái Ngọc Duy2013-11-211-3/+3
* | | | Merge branch 'jj/doc-markup-gitcli' into maintJunio C Hamano2013-12-171-5/+5
|\ \ \ \
| * | | | Documentation/gitcli.txt: fix double quotesjj/doc-markup-gitcliJason St. John2013-11-201-5/+5
* | | | | Merge branch 'jj/doc-markup-hints-in-coding-guidelines' into maintJunio C Hamano2013-12-171-3/+31
|\ \ \ \ \
| * | | | | State correct usage of literal examples in man pages in the coding standardsjj/doc-markup-hints-in-coding-guidelinesJason St. John2013-11-181-3/+31
* | | | | | Merge branch 'jj/log-doc' into maintJunio C Hamano2013-12-171-26/+25
|\ \ \ \ \ \
| * | | | | | Documentation/git-log.txt: mark-up fix and minor rephasingjj/log-docJason St. John2013-11-131-23/+23
| * | | | | | Documentation/git-log: update "--log-size" descriptionJason St. John2013-11-131-5/+5
| |/ / / / /
* | | | | | Merge branch 'jj/rev-list-options-doc' into maintJunio C Hamano2013-12-171-156/+87
|\ \ \ \ \ \
| * | | | | | Documentation/rev-list-options.txt: fix some grammatical issues and typosjj/rev-list-options-docJason St. John2013-11-181-13/+14
| * | | | | | Documentation/rev-list-options.txt: fix mark-upJason St. John2013-11-181-148/+78
| |/ / / / /
* | | | | | Merge branch 'tb/doc-fetch-pack-url' into maintJunio C Hamano2013-12-171-8/+7
|\ \ \ \ \ \
| * | | | | | git-fetch-pack uses URLs like git-fetchtb/doc-fetch-pack-urlTorsten Bögershausen2013-11-111-8/+7
| |/ / / / /
* | | | | | Merge branch 'mi/typofixes' into maintJunio C Hamano2013-12-178-10/+10
|\ \ \ \ \ \
| * | | | | | contrib: typofixesmi/typofixesMasanari Iida2013-11-124-4/+4
| * | | | | | Documentation/technical/http-protocol.txt: typofixesMasanari Iida2013-11-121-2/+2
| * | | | | | typofixes: fix misspelt commentsMasanari Iida2013-11-123-4/+4
* | | | | | | Merge branch 'jh/loose-object-dirs-creation-race' into maintJunio C Hamano2013-12-171-1/+3
|\ \ \ \ \ \ \
| * | | | | | | sha1_file.c:create_tmpfile(): Fix race when creating loose object dirsjh/loose-object-dirs-creation-raceJohan Herland2013-10-281-1/+3
* | | | | | | | Merge branch 'jk/two-way-merge-corner-case-fix' into maintJunio C Hamano2013-12-173-97/+121
|\ \ \ \ \ \ \ \
| * | | | | | | | t1005: add test for "read-tree --reset -u A B"jk/two-way-merge-corner-case-fixJunio C Hamano2013-11-041-0/+15
| * | | | | | | | t1005: reindentJunio C Hamano2013-11-042-89/+89
| * | | | | | | | unpack-trees: fix "read-tree -u --reset A B" with conflicted indexJeff King2013-11-041-8/+17
* | | | | | | | | Merge branch 'sb/sha1-loose-object-info-check-existence' into maintJunio C Hamano2013-12-172-6/+15
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | sha1_loose_object_info(): do not return success on missing objectsb/sha1-loose-object-info-check-existenceJunio C Hamano2013-11-062-6/+15
* | | | | | | | | | Merge branch 'nd/magic-pathspec' into maintJunio C Hamano2013-12-172-10/+13
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | diff: restrict pathspec limitations to diff b/f case onlynd/magic-pathspecNguyễn Thái Ngọc Duy2013-11-202-10/+13
* | | | | | | | | | | cmd_repack(): remove redundant local variable "nr_packs"Michael Haggerty2013-12-171-4/+2
* | | | | | | | | | | Git 1.8.5.1v1.8.5.1Junio C Hamano2013-12-034-3/+13
* | | | | | | | | | | ref-iteration doc: add_submodule_odb() returns 0 for successNick Townsend2013-12-031-2/+2
* | | | | | | | | | | Sync with 1.8.4.5Junio C Hamano2013-12-024-6/+45
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Git 1.8.4.5v1.8.4.5maint-1.8.4Junio C Hamano2013-12-024-3/+17
| * | | | | | | | | | | submodule: do not copy unknown update mode from .gitmodulesJunio C Hamano2013-12-022-5/+30
* | | | | | | | | | | | Git 1.8.5v1.8.5Junio C Hamano2013-11-272-1/+6
* | | | | | | | | | | | Sync with maintJunio C Hamano2013-11-270-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | remote-hg: don't decode UTF-8 paths into Unicode objectsRichard Hansen2013-11-271-1/+1
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'rh/remote-hg-bzr-updates' (early part)Junio C Hamano2013-11-251-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | |
| * | | | | | | | | | remote-hg: don't decode UTF-8 paths into Unicode objectsRichard Hansen2013-11-181-1/+1
* | | | | | | | | | | Git 1.8.5-rc3v1.8.5-rc3Junio C Hamano2013-11-201-1/+1
* | | | | | | | | | | Sync with 1.8.4.4Junio C Hamano2013-11-202-1/+12
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Git 1.8.4.4v1.8.4.4Junio C Hamano2013-11-203-2/+13