delta/git.git/Documentation/howto/maintain-git.txt, branch kf/http-proxy-auth-methods

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

2014-02-05T22:14:00+00:00

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 'ta/doc-no-small-caps'

2013-02-06T00:13:32+00:00

Update documentation to change "GIT" which was a poor-man's small
caps to "Git".  The latter was the intended spelling.

Also change "git" spelled in all-lowercase to "Git" when it refers
to the system as the whole or the concept it embodies, as opposed to
the command the end users would type.

* ta/doc-no-small-caps:
  Documentation: StGit is the right spelling, not StGIT
  Documentation: describe the "repository" in repository-layout
  Documentation: add a description for 'gitfile' to glossary
  Documentation: do not use undefined terms git-dir and git-file
  Documentation: the name of the system is 'Git', not 'git'
  Documentation: avoid poor-man's small caps GIT

Documentation: the name of the system is 'Git', not 'git'

2013-02-01T21:53:33+00:00

Signed-off-by: Thomas Ackermann 
Signed-off-by: Junio C Hamano

Merge branch 'jc/doc-maintainer'

2013-01-25T20:34:52+00:00

Describe tools for automation that were invented since this
document was originally written.

* jc/doc-maintainer:
  howto/maintain: document "### match next" convention in jch/pu branch
  howto/maintain: mark titles for asciidoc
  Documentation: update "howto maintain git"

howto/maintain: document "### match next" convention in jch/pu branch

2013-01-25T20:34:43+00:00

Signed-off-by: Junio C Hamano

howto/maintain: mark titles for asciidoc

2013-01-04T06:59:47+00:00

Documentation: update "howto maintain git"

2013-01-03T22:43:56+00:00

The flow described in the document is still correct, but over time I
have automated various parts of the workflow with tools and their
use was not explained at all.

Update it and outline the use of two key scripts from the 'todo'
branch, "Reintegrate" and "cook".

Signed-off-by: Junio C Hamano

Documentation/howto: convert plain text files to asciidoc

2012-10-18T17:51:34+00:00

These were not originally meant for asciidoc, but they are already
so close.  Mark them up in asciidoc.

Signed-off-by: Thomas Ackermann 
Signed-off-by: Junio C Hamano

Minor update to how-to maintain git

2011-09-07T18:18:18+00:00

A few more parts of this document is stale that needs updating
to reflect the reality, but I do not regularly rebase topics that
are only in "pu" anymore, which may be noteworthy for a commit.

Signed-off-by: Junio C Hamano

Use 'fast-forward' all over the place

2009-10-25T06:50:28+00:00

It's a compound word.

Signed-off-by: Felipe Contreras 
Signed-off-by: Junio C Hamano