summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Expand)AuthorAgeFilesLines
* introduce "preciousObjects" repository extensionjk/repository-extensionJeff King2015-06-241-0/+7
* introduce "extensions" form of core.repositoryformatversionJeff King2015-06-241-0/+81
* Ninth batch for 2.5Junio C Hamano2015-06-241-39/+102
* Merge branch 'fk/doc-format-patch-vn'Junio C Hamano2015-06-241-1/+1
|\
| * doc: format-patch: fix typofk/doc-format-patch-vnFrans Klaver2015-06-101-1/+1
* | Merge branch 'rl/am-3way-config'Junio C Hamano2015-06-242-2/+13
|\ \
| * | git-am: add am.threeWay config variablerl/am-3way-configRemi Lespinet2015-06-042-2/+13
* | | Merge branch 'jc/ll-merge-expose-path'Junio C Hamano2015-06-241-1/+4
|\ \ \
| * | | ll-merge: pass the original path to external driversjc/ll-merge-expose-pathJunio C Hamano2015-06-041-1/+4
* | | | Merge branch 'pt/pull-optparse'Junio C Hamano2015-06-241-3/+0
|\ \ \ \
| * | | | pull: handle git-fetch's options as wellPaul Tan2015-06-021-3/+0
* | | | | Merge branch 'qn/blame-show-email'Junio C Hamano2015-06-241-0/+2
|\ \ \ \ \
| * | | | | blame: add blame.showEmail configurationqn/blame-show-emailQuentin Neill2015-06-011-0/+2
| | |_|/ / | |/| | |
* | | | | Merge branch 'es/send-email-sendmail-alias'Junio C Hamano2015-06-241-2/+3
|\ \ \ \ \
| * | | | | send-email: implement sendmail aliases line continuation supportEric Sunshine2015-06-011-2/+0
| * | | | | send-email: further document missing sendmail aliases functionalityEric Sunshine2015-06-011-0/+3
* | | | | | Eighth batch for 2.5Junio C Hamano2015-06-161-1/+11
* | | | | | Sync with 2.4.4Junio C Hamano2015-06-162-1/+37
|\ \ \ \ \ \
| * | | | | | Git 2.4.4v2.4.4Junio C Hamano2015-06-162-1/+37
| * | | | | | Merge branch 'sb/submodule-doc-intro' into maintJunio C Hamano2015-06-161-28/+22
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'sb/glossary-submodule' into maintJunio C Hamano2015-06-161-0/+16
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'mc/commit-doc-grammofix' into maintJunio C Hamano2015-06-161-1/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jk/http-backend-deadlock' into maintJunio C Hamano2015-06-161-0/+9
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'mm/log-format-raw-doc' into maintJunio C Hamano2015-06-162-2/+14
| |\ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ Merge branch 'sb/pack-protocol-mention-smart-http'Junio C Hamano2015-06-161-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Documentation/technical/pack-protocol: mention http as possible protocolsb/pack-protocol-mention-smart-httpStefan Beller2015-06-021-3/+3
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'sg/merge-summary-config'Junio C Hamano2015-06-163-16/+12
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Documentation: include 'merge.branchdesc' for merge and config as wellsg/merge-summary-configSZEDER Gábor2015-05-283-16/+12
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'ah/send-email-sendmail-alias'Junio C Hamano2015-06-161-1/+17
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
| * | | | | | | | | | | send-email: add sendmail email aliases formatAllen Hubbe2015-05-271-1/+17
* | | | | | | | | | | | Second half of seventh batchJunio C Hamano2015-06-111-0/+28
* | | | | | | | | | | | Merge branch 'sb/glossary-submodule'Junio C Hamano2015-06-111-0/+16
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | glossary: add "remote", "submodule", "superproject"sb/glossary-submoduleStefan Beller2015-05-291-0/+16
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'sb/submodule-doc-intro'Junio C Hamano2015-06-111-28/+22
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
| * | | | | | | | | | submodule doc: reorder introductory paragraphssb/submodule-doc-introStefan Beller2015-05-281-28/+22
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'jk/color-diff-plain-is-context'Junio C Hamano2015-06-111-1/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | diff: accept color.diff.context as a synonym for "plain"Jeff King2015-05-271-1/+2
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jc/diff-ws-error-highlight'Junio C Hamano2015-06-111-0/+10
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | diff.c: --ws-error-highlight=<kind> optionJunio C Hamano2015-05-261-0/+10
| |/ / / / / / / / /
* | | | | | | | | | Sync with 2.4.3Junio C Hamano2015-06-052-1/+78
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| * | | | | | | | | Git 2.4.3v2.4.3Junio C Hamano2015-06-052-1/+78
| * | | | | | | | | Merge branch 'ps/doc-packfile-vs-pack-file' into maintJunio C Hamano2015-06-053-9/+9
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'fg/document-commit-message-stripping' into maintJunio C Hamano2015-06-051-4/+7
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'pt/pull-ff-vs-merge-ff' into maintJunio C Hamano2015-06-051-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ja/tutorial-asciidoctor-fix' into maintJunio C Hamano2015-06-051-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/stripspace-asciidoctor-fix' into maintJunio C Hamano2015-06-051-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/asciidoc-markup-fix' into maintJunio C Hamano2015-06-0519-102/+107
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'pt/xdg-config-path' into maintJunio C Hamano2015-06-051-2/+33
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | The first half of the seventh batch for 2.5Junio C Hamano2015-06-051-0/+14
* | | | | | | | | | | | | | | | | Merge branch 'bc/object-id'Junio C Hamano2015-06-051-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status