summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* gitignore doc: add global gitignore to synopsisjn/ignore-docJonathan Nieder2014-01-161-1/+1
* Git 1.8.5.3v1.8.5.3Junio C Hamano2014-01-134-3/+31
* Merge branch 'nd/daemon-informative-errors-typofix' into maintJunio C Hamano2014-01-131-2/+2
|\
| * daemon: be strict at parsing parameters --[no-]informative-errorsnd/daemon-informative-errors-typofixNguyễn Thái Ngọc Duy2013-12-201-2/+2
* | Merge branch 'km/gc-eperm' into maintJunio C Hamano2014-01-131-1/+1
|\ \
| * | gc: notice gc processes run by other userskm/gc-epermKyle J. McKay2014-01-021-1/+1
* | | Merge branch 'jk/credential-plug-leak' into maintJunio C Hamano2014-01-131-1/+2
|\ \ \
| * | | Revert "prompt: clean up strbuf usage"jk/credential-plug-leakJeff King2014-01-021-1/+2
| |/ /
* | | Merge branch 'mm/mv-file-to-no-such-dir-with-slash' into maintJunio C Hamano2014-01-132-7/+47
|\ \ \
| * | | mv: let 'git mv file no-such-dir/' error out on Windows, toomm/mv-file-to-no-such-dir-with-slashJohannes Sixt2014-01-101-0/+2
| * | | mv: let 'git mv file no-such-dir/' error outMatthieu Moy2013-12-042-7/+45
* | | | Merge branch 'jk/rev-parse-double-dashes' into maintJunio C Hamano2014-01-132-1/+39
|\ \ \ \
| * | | | rev-parse: be more careful with munging argumentsjk/rev-parse-double-dashesJeff King2013-12-091-1/+5
| * | | | rev-parse: correctly diagnose revision errors before "--"Jeff King2013-12-092-0/+34
| |/ / /
* | | | Merge branch 'jk/cat-file-regression-fix' into maintJunio C Hamano2014-01-132-10/+42
|\ \ \ \
| * | | | cat-file: handle --batch format with missing type/sizejk/cat-file-regression-fixJeff King2013-12-122-1/+32
| * | | | cat-file: pass expand_data to print_object_or_dieJeff King2013-12-121-10/+11
| | |/ / | |/| |
* | | | pack-heuristics.txt: mark up the file header properlyThomas Ackermann2014-01-131-2/+2
* | | | Merge branch 'maint' of git://github.com/git-l10n/git-po into maintJunio C Hamano2014-01-061-8/+8
|\ \ \ \
| * | | | l10n: de.po: fix translation of 'prefix'Ralf Thielow2014-01-031-8/+8
* | | | | Documentation/gitmodules: Only 'update' and 'url' are requiredW. Trevor King2014-01-061-0/+2
* | | | | for-each-ref: remove unused variableRamkumar Ramachandra2013-12-301-2/+1
|/ / / /
* | | | 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