git/Documentation, branch v1.8.2.2

Git 1.8.2.2

2013-04-26T19:59:36Z

Signed-off-by: Junio C Hamano

Merge branch 'jn/gitweb-install-doc' into maint

2013-04-26T18:12:48Z

* jn/gitweb-install-doc: gitweb/INSTALL: GITWEB_CONFIG_SYSTEM is for backward compatibility gitweb/INSTALL: Simplify description of GITWEB_CONFIG_SYSTEM

Update draft release notes to 1.8.2.2

2013-04-24T23:22:07Z

Signed-off-by: Junio C Hamano

Merge branch 'jk/diff-algo-finishing-touches' into maint

2013-04-24T23:19:42Z

"git diff --diff-algorithm=algo" was understood by the command line parser, but "git diff --diff-algorithm algo" was not. * jk/diff-algo-finishing-touches: diff: allow unstuck arguments with --diff-algorithm git-merge(1): document diff-algorithm option to merge-recursive

Start preparing for 1.8.2.2

2013-04-22T18:32:58Z

Signed-off-by: Junio C Hamano

Merge branch 'ta/glossary' into maint

2013-04-22T18:26:58Z

* ta/glossary: glossary: improve definitions of refspec and pathspec The name of the hash function is "SHA-1", not "SHA1" glossary: improve description of SHA-1 related topics glossary: remove outdated/misleading/irrelevant entries

Merge branch 'jk/doc-http-backend' into maint

2013-04-22T18:26:58Z

Improve documentation to illustrate "push authenticated, fetch anonymous" configuration for smart HTTP servers. * jk/doc-http-backend: doc/http-backend: match query-string in apache half-auth example doc/http-backend: give some lighttpd config examples doc/http-backend: clarify "half-auth" repo configuration

Merge branch 'jk/daemon-user-doc' into maint

2013-04-22T18:26:58Z

* jk/daemon-user-doc: doc: clarify that "git daemon --user=" option does not export HOME=~user

Merge branch 'jc/detached-head-doc' into maint

2013-04-22T18:26:57Z

* jc/detached-head-doc: glossary: extend "detached HEAD" description Conflicts: Documentation/glossary-content.txt

gitweb/INSTALL: GITWEB_CONFIG_SYSTEM is for backward compatibility

2013-04-17T22:18:12Z

Highlight that CONFIG_SYSTEM and /etc/gitweb.conf are meant to be the fallback configuration file in BUGS section of gitweb.conf documentation. This will hopefully help people who expect them to be a common default, which unfortunately came later in the history.