git/Documentation, branch v2.5.0

Git 2.5

2015-07-27T19:29:47Z

Signed-off-by: Junio C Hamano

Sync with 2.4.7

2015-07-27T19:26:40Z

Git 2.4.7

2015-07-27T19:25:42Z

Signed-off-by: Junio C Hamano

Merge branch 'jk/pretty-encoding-doc' into maint

2015-07-27T19:21:48Z

Doc update. * jk/pretty-encoding-doc: docs: clarify that --encoding can produce invalid sequences

Merge branch 'tb/checkout-doc' into maint

2015-07-27T19:21:47Z

Doc update. * tb/checkout-doc: git-checkout.txt: document "git checkout " better

Merge branch 'ls/hint-rev-list-count' into maint

2015-07-27T19:21:47Z

* ls/hint-rev-list-count: rev-list: add --count to usage guide

Merge branch 'mm/branch-doc-updates' into maint

2015-07-27T19:21:46Z

* mm/branch-doc-updates: Documentation/branch: document -M and -D in terms of --force Documentation/branch: document -d --force and -m --force

RelNotes: am.threeWay does not exist (yet)

2015-07-24T21:31:23Z

Signed-off-by: Junio C Hamano

Revert "git-am: add am.threeWay config variable"

2015-07-24T17:55:24Z

This reverts commit d96a275b91bae1800cd43be0651e886e7e042a17. It used to be possible to apply a patch series with "git am mbox" and then only after seeing a failure, switch to three-way mode via "git am -3" (no other options or arguments). The commit being reverted broke this workflow. Signed-off-by: Junio C Hamano

Merge branch 'tf/gitweb-typofix'

2015-07-21T19:45:27Z

* tf/gitweb-typofix: gitweb: fix typo in man page