git/Documentation/howto, branch v2.3.2

Documentation: typofixes

2014-11-04T21:14:44Z

In addition to fixing trivial and obvious typos, be careful about the following points: - Spell ASCII, URL and CRC in ALL CAPS; - Spell Linux as Capitalized; - Do not omit periods in "i.e." and "e.g.". Signed-off-by: Thomas Ackermann Signed-off-by: Junio C Hamano

Merge branch 'ss/howto-manage-trunk'

2014-06-06T18:39:12Z

* ss/howto-manage-trunk: How to keep a project's canonical history correct.

How to keep a project's canonical history correct.

2014-05-28T20:35:43Z

During the mail thread about "Pull is mostly evil" a user asked how the first parent could become reversed. This howto explains how the first parent can get reversed when viewed by the project and then explains a method to keep the history correct. Signed-off-by: Stephen P. Smith Signed-off-by: Junio C Hamano

Documentation: use "command-line" when used as a compound adjective, and fix other minor grammatical issues

2014-05-21T20:57:10Z

Signed-off-by: Jason St. John Signed-off-by: Junio C Hamano

Documentation: fix misuses of "nor"

2014-03-31T22:16:22Z

Signed-off-by: Justin Lebar Signed-off-by: Junio C Hamano

howto/maintain-git.txt: new version numbering scheme

2014-02-05T22:14:00Z

We wanted to call the upcoming release "Git 1.9", with its maintenance track being "Git 1.9.1", "Git 1.9.2", etc., but various third-party tools are reported to assume that there are at least three dewey-decimal components in our version number. Adjust the plan so that vX.Y.0 are feature releases while vX.Y.Z (Z > 0) are maintenance releases. Signed-off-by: Junio C Hamano

Merge branch 'sc/doc-howto-dumb-http'

2013-11-04T22:57:57Z

* sc/doc-howto-dumb-http: doc/howto: warn about (dumb)http server document being too old

doc/howto: warn about (dumb)http server document being too old

2013-10-28T20:24:56Z

Describe when it is still applicable, and tell people where to go for most normal cases. Signed-off-by: Sitaram Chamarty Signed-off-by: Junio C Hamano

howto: add article on recovering a corrupted object

2013-10-25T21:55:30Z

This is an asciidoc-ified version of a corruption post-mortem sent to the git list. It complements the existing howto article, since it covers a case where the object couldn't be easily recreated or copied from elsewhere. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

Merge branch 'rj/doc-formatting-fix'

2013-10-14T18:07:50Z

* rj/doc-formatting-fix: howto/revert-a-faulty-merge: fix unescaped '^'s howto/setup-git-server-over-http: fix unescaped '^'s